From ea280b05f89f5b983b7a5ed5a493594b10f40579 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 4 May 2023 13:53:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=A1=B5=E6=95=B0=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/user/dao/mapper/SysUserMapper.xml | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
index e89cfc99e..65eb3052b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
@@ -52,25 +52,14 @@
         <result column="updateTime" property="updateTime" />
         <result column="extpersonId" property="extpersonId" />
         <result column="extuserId" property="extuserId" />
-        <collection property="depts" ofType="org.nl.system.service.dept.dao.SysDept">
-            <id property="deptId" column="deptId"/>
-            <result column="deptName" property="name"/>
-        </collection>
-        <collection property="roles" ofType="org.nl.system.service.role.dao.SysRole">
-            <id property="roleId" column="roleId"/>
-        </collection>
+        <collection property="depts" ofType="org.nl.system.service.dept.dao.SysDept" column="userId" select="selectDept"></collection>
+        <collection property="roles" ofType="org.nl.system.service.role.dao.SysRole" column="userId" select="selectRole"></collection>
     </resultMap>
     <select id="getUserDetail" resultMap="UserDetail">
         SELECT
         <include refid="Base_Column_List"/>
-        ,sys_dept.dept_id as deptId
-        ,sys_dept.name as deptName
-        ,sys_users_roles.role_id as roleId
         FROM
         sys_user
-        left join sys_user_dept on sys_user.user_id = sys_user_dept.user_id
-        left join sys_users_roles on sys_users_roles.user_id = sys_user.user_id
-        left join sys_dept on sys_user_dept.dept_id = sys_dept.dept_id
         <where>
             <if test="query.deptId  != null">
                 and
@@ -90,6 +79,20 @@
             </if>
         </where>
     </select>
+    <select id="selectDept" resultType="org.nl.system.service.dept.dao.SysDept">
+        select
+               sys_dept.dept_id as deptId,
+               sys_dept.name as name
+        from   sys_dept
+        left join sys_user_dept
+            on sys_user_dept.dept_id = sys_dept.dept_id
+        where user_id = #{userId}
+    </select>
+    <select id="selectRole" resultType="org.nl.system.service.role.dao.SysRole">
+        select role_id as roleId
+        from sys_users_roles
+        where user_id = #{userId}
+    </select>
 
     <select id="getDetailForMap" resultType="java.util.Map">
         SELECT