From ff08cfb548fc47c36cd34d5202b365eef9ac81e7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Nov 2021 17:59:51 +0800
Subject: [PATCH] Merge branch 'ty_fix' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 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 9eaeb25..557d4ea 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
@@ -1333,7 +1333,9 @@
     </select>
 
     <select id="selectUserByOpenId" resultMap="SysUsersMap">
-        select * from sys_users where find_in_set(#{openId}, open_ids)
+        select *,
+        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName
+        from sys_users where find_in_set(#{openId}, open_ids)
         <if test="companyId != null">
             and company_id=#{companyId}
         </if>

--
Gitblit v1.9.1