From 4c47534eda0702136016312666b46578bfb6368b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 20 Dec 2020 16:30:39 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
index 05a7862..321834c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
@@ -1273,7 +1273,7 @@
<select id="selectByRoleName" resultMap="SysUsersMap">
SELECT
- a.*
+ distinct a.*
FROM
sys_users a
LEFT JOIN sys_role r ON FIND_IN_SET(r.role_id, a.role_ids)
@@ -1290,7 +1290,6 @@
<if test="users.shopId !=null and users.shopId !=''">
AND a.SHOP_ID = #{users.shopId}
</if>
-
ORDER BY
a.SIGN_ORDER IS NULL,
a.SIGN_ORDER
--
Gitblit v1.9.1