系统用户角色描述

src/main/java/com/caimei365/manager/dao/SystemDao.java

@@ -99,7 +99,7 @@ public interface SystemDao {
     /**
      * 根据角色ID获取菜单Ids
      */
-    List<String> getMenuIdsByRoleId(Integer roleId);
+    List<Integer> getMenuIdsByRoleId(Integer roleId);
     /**
      * 保存角色菜单关系
      */

src/main/java/com/caimei365/manager/service/sys/impl/SysRoleServiceImpl.java

@@ -49,8 +49,8 @@ public class SysRoleServiceImpl implements SysRoleService {
         SysRole sysRole = getRole(id);
         if (null != sysRole) {
             // 根据角色ID获取菜单Ids
-            List<String> menuIdList = systemDao.getMenuIdsByRoleId(id);
-            String menuIds = CommonUtil.listToString(menuIdList, ",");
+            List<Integer> menuIdList = systemDao.getMenuIdsByRoleId(id);
+            String menuIds = CommonUtil.idListToString(menuIdList, ",");
             sysRole.setMenuIds(menuIds);
         }
         return ResponseJson.success(sysRole);

src/main/java/com/caimei365/manager/service/sys/impl/SysUserServiceImpl.java

@@ -46,22 +46,7 @@ public class SysUserServiceImpl implements SysUserService {
         if (StringUtils.hasLength(username)) {
             SysUser sysUser = systemDao.findByUsername(username);
             if (null != sysUser) {
-                List<String> roleNames = new ArrayList<>();
-                List<Integer> roleIds = new ArrayList<>();
-                StringBuilder roleDesc = new StringBuilder();
-                // 根据用户Id获取用户角色列表
-                List<SysRole> roleList = systemDao.getRoleListByUserId(sysUser.getId());
-                if (!CollectionUtils.isEmpty(roleList)) {
-                    for (SysRole role : roleList) {
-                        if (null != role) {
-                            roleNames.add(role.getRoleName());
-                            roleIds.add(role.getId());
-                            roleDesc.append(role.getRoleDesc()).append(" ");
-                        }
-                    }
-                }
-                sysUser.setRoles(roleNames);
-                sysUser.setRoleDesc(roleDesc.toString());
+                List<Integer> roleIds = setUserRoleInfo(sysUser);
                 List<SysMenu> menus = null;
                 if (!CollectionUtils.isEmpty(roleIds)) {
                     // 根据角色Id获取菜单列表
@@ -75,6 +60,28 @@ public class SysUserServiceImpl implements SysUserService {
         return ResponseJson.error("用户数据异常", null);
     }
 
+    private List<Integer> setUserRoleInfo(SysUser sysUser) {
+        List<Integer> roleIds = new ArrayList<>();
+        if (null != sysUser) {
+            List<String> roleNames = new ArrayList<>();
+            StringBuilder roleDesc = new StringBuilder();
+            // 根据用户Id获取用户角色列表
+            List<SysRole> roleList = systemDao.getRoleListByUserId(sysUser.getId());
+            if (!CollectionUtils.isEmpty(roleList)) {
+                for (SysRole role : roleList) {
+                    if (null != role) {
+                        roleNames.add(role.getRoleName());
+                        roleDesc.append(role.getRoleDesc()).append(" ");
+                        roleIds.add(role.getId());
+                    }
+                }
+            }
+            sysUser.setRoles(roleNames);
+            sysUser.setRoleDesc(roleDesc.toString());
+        }
+        return roleIds;
+    }
+
     /**
      * 退出登录
      */
@@ -97,8 +104,13 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public ResponseJson<PaginationVo<SysUser>> getUserList(String username, String fullName, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<SysUser> menus = systemDao.getUserList(username, fullName);
-        PaginationVo<SysUser> pageData = new PaginationVo<>(menus);
+        List<SysUser> userList = systemDao.getUserList(username, fullName);
+        for (SysUser sysUser : userList) {
+            List<Integer> roleIdList = setUserRoleInfo(sysUser);
+            String roleIds = CommonUtil.idListToString(roleIdList, ",");
+            sysUser.setRoleIds(roleIds);
+        }
+        PaginationVo<SysUser> pageData = new PaginationVo<>(userList);
         return ResponseJson.success(pageData);
     }
 
@@ -108,12 +120,10 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public ResponseJson<SysUser> getUser(Integer id) {
         SysUser sysUser = systemDao.getUser(id);
-        if (null != sysUser) {
-            // 根据用户ID获取角色Ids
-            List<String> roleIdList = systemDao.getRoleIdsByUserId(id);
-            String roleIds = CommonUtil.listToString(roleIdList, ",");
-            sysUser.setRoleIds(roleIds);
-        }
+        sysUser.setPassword("");
+        List<Integer> roleIdList = setUserRoleInfo(sysUser);
+        String roleIds = CommonUtil.idListToString(roleIdList, ",");
+        sysUser.setRoleIds(roleIds);
         return ResponseJson.success(sysUser);
     }
 

src/main/java/com/caimei365/manager/utils/CommonUtil.java

@@ -13,22 +13,22 @@ import java.util.List;
 public class CommonUtil {
     /**
      * 列表拼接成字符串
-     * @param list List<String>
+     * @param list List<Integer>
      * @param join 分隔符，默认','
      * @return String
      */
-    public static String listToString(List<String> list, String join){
+    public static String idListToString(List<Integer> list, String join){
         String split = ",";
         if (StringUtils.hasLength(join)){
             split = join;
         }
         StringBuilder str = new StringBuilder();
         for (int i = 0; i < list.size(); i++) {
-            if (StringUtils.hasLength(list.get(i))){
+            if (StringUtils.hasLength(list.get(i).toString())){
                 if (i == 0) {
-                    str.append(list.get(i));
+                    str.append(list.get(i).toString());
                 } else {
-                    str.append(split).append(list.get(i));
+                    str.append(split).append(list.get(i).toString());
                 }
             }
         }

src/main/resources/mapper/SystemDao.xml

@@ -82,7 +82,7 @@
         INSERT INTO system_role(role_name, role_desc, create_time)
         VALUES (#{roleName}, #{roleDesc}, NOW())
     </insert>
-    <select id="getMenuIdsByRoleId" resultType="java.lang.String">
+    <select id="getMenuIdsByRoleId" resultType="java.lang.Integer">
         SELECT DISTINCT menu_id FROM system_role_menu WHERE role_id = #{roleId}
     </select>
     <insert id="insertRoleMenuRelation">