From 321d1fae7dbd5b399d8df3491ef60a8ea2575451 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sun, 27 Dec 2020 10:53:41 +0800 Subject: [PATCH] Merge branch 'ty_urgent' into api --- 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