fix: [系统管理] [用户管理] 页面数据bug

hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysUser.java

@@ -98,6 +98,9 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /** 角色名称 */
+    private String roleNames;
+
     public SysUser()
     {
 
@@ -296,6 +299,14 @@ public class SysUser extends BaseEntity
         this.roleIds = roleIds;
     }
 
+    public String getRoleNames() {
+        return roleNames;
+    }
+
+    public void setRoleNames(String roleNames) {
+        this.roleNames = roleNames;
+    }
+
     public Long[] getPostIds()
     {
         return postIds;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java

@@ -107,7 +107,9 @@ public class SysUserController extends BaseController
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
+        TableDataInfo tableDataInfo = getDataTable(list);
+        tableDataInfo.setRows(userService.initRoleNames((List<SysUser>)tableDataInfo.getRows()));
+        return tableDataInfo;
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@@ -116,6 +118,7 @@ public class SysUserController extends BaseController
     public void export(HttpServletResponse response, SysUser user)
     {
         List<SysUser> list = userService.selectUserList(user);
+        list = userService.initRoleNames(list);
         List<UserExportDto> userList = new ArrayList<>();
         for(SysUser u : list){
             UserExportDto exportDto = new UserExportDto();
@@ -123,7 +126,7 @@ public class SysUserController extends BaseController
             exportDto.setNickName(u.getNickName());
             exportDto.setEmail(u.getEmail());
             exportDto.setDeptName(u.getDept()==null?"":u.getDept().getDeptName());
-            exportDto.setRoleName(getRoleName(u.getRoles()));
+            exportDto.setRoleName(u.getRoleNames());
 
             exportDto.setStatus("0".endsWith(u.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled"));
             userList.add(exportDto);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java

@@ -23,6 +23,13 @@ public interface SysUserMapper
     public List<SysUser> selectUserList(SysUser sysUser);
 
     /**
+     * 获取用户的角色
+     * @param userIdList
+     * @return
+     */
+    public List<SysUser> selectUserRoleNames(@Param("userIdList") List<Long> userIdList);
+
+    /**
      * 根据条件分页查询已配用户角色列表
      * 
      * @param user 用户信息

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java

@@ -24,6 +24,13 @@ public interface ISysUserService
     public List<SysUser> selectUserList(SysUser user);
 
     /**
+     * 赋值用户的角色
+     * @param list
+     * @return
+     */
+    public List<SysUser> initRoleNames(List<SysUser> list);
+
+    /**
      * 根据条件分页查询已分配用户角色列表
      * 
      * @param user 用户信息

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java

@@ -103,6 +103,22 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> initRoleNames(List<SysUser> list) {
+        if(list!=null && list.size()>0){
+            List<SysUser> roleNameList = userMapper.selectUserRoleNames(list.stream().map(o->o.getUserId()).collect(Collectors.toList()));
+            for(SysUser l : list){
+                for(SysUser r: roleNameList){
+                    if(l.getUserId().equals(r.getUserId())){
+                        l.setRoleNames(r.getRemark());
+                        break;
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"     />
         <result property="updateBy"      column="update_by"       />
         <result property="updateTime"    column="update_time"     />
-        <result property="remark"        column="remark"          />
+		<result property="remark"        column="remark"          />
         <association property="dept"     javaType="com.hxhq.system.api.domain.SysDept"         resultMap="deptResult" />
         <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="com.hxhq.system.api.domain.SysUser" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
--- 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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 from sys_user u
--- 		left join sys_dept d on u.dept_id = d.dept_id
+
+ 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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 from sys_user u
+ 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0' and u.user_id&lt;>1
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -92,6 +92,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 -- 		${params.dataScope}
 	</select>
+
+	<select id="selectUserRoleNames" parameterType="com.hxhq.system.api.domain.SysUser" resultMap="SysUserResult">
+		SELECT ur.`user_id`,GROUP_CONCAT(r.`role_name`) AS remark FROM `sys_user_role` ur
+		JOIN `sys_role` r ON ur.`role_id`=r.`role_id`
+		WHERE ur.`user_id` IN
+		<foreach collection="userIdList" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
+		GROUP BY ur.`user_id`
+	</select>
 	
 	<select id="selectAllocatedList" parameterType="com.hxhq.system.api.domain.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time