Explorar o código

fix 系统用户

he2802 %!s(int64=3) %!d(string=hai) anos
pai
achega
fcba864770

+ 12 - 5
zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -25,9 +25,19 @@
         <result property="remark" column="remark"/>
         <result property="code" column="code"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
-        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
+        <collection property="roles" column="user_id" select="findRolesList" javaType="java.util.List" />
     </resultMap>
 
+    <select id="findRolesList" resultMap="RoleResult">
+        SELECT
+            r.role_id,
+            r.role_name
+        FROM
+            sys_user_role ur
+        LEFT JOIN sys_role r ON r.role_id = ur.role_id
+        where u.del_flag = '0' and ur.user_id =#{user_id}
+    </select>
+
     <resultMap id="deptResult" type="SysDept">
         <id property="deptId" column="dept_id"/>
         <result property="parentId" column="parent_id"/>
@@ -84,12 +94,9 @@
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
         u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-        r.role_id,u.code,
-        r.role_name from
+        u.code from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
-        LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
-        LEFT JOIN sys_role r ON r.role_id = ur.role_id
         where u.del_flag = '0'
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')