From 140daca102290a51faf899e370d4be1807e5f3f6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 3 Jun 2021 13:38:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtSysUserMapper.xml      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
index a74e5045ff..2c1798644d 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
@@ -21,18 +21,21 @@
             <result column="dept_name" property="deptName" />
         </association>
         <association property="dept" column="dept_id" javaType="io.dataease.controller.sys.response.SysUserDept" resultMap="sysUserDept"/>
-        <collection property="roles" ofType="io.dataease.controller.sys.response.SysUserRole" >
-            <id column="role_id" property="roleId" />
-            <result column="role_name" property="roleName"/>
+
+        <collection property="roles"
+                    javaType="java.util.ArrayList"
+                    ofType="io.dataease.controller.sys.response.SysUserRole"
+                    column="user_id"
+                    select="queryRole">
         </collection>
     </resultMap>
 
 
 
+
     <select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="BaseResultMap">
-        select u.*,u.user_id as id, r.role_id,r.name as role_name , d.pid, d.name as dept_name
-        from sys_user u left join sys_users_roles ur on u.user_id = ur.user_id
-        left join sys_role r on r.role_id = ur.role_id
+        select u.*,u.user_id as id, d.pid, d.name as dept_name
+        from sys_user u
         left join sys_dept d on d.dept_id = u.dept_id
 
         <if test="_parameter != null">
@@ -45,4 +48,11 @@
             order by u.update_time desc
         </if>
     </select>
+
+    <select id="queryRole" resultMap="sysUserRole">
+        select r.role_id, r.name as role_name
+        from sys_users_roles sur
+        left join sys_role r on r.role_id = sur.role_id
+        where sur.user_id = #{user_id}
+    </select>
 </mapper>