Просмотр исходного кода

修复长主键溢出问题 将查询返回类型改为 Long

RuoYi лет назад: 4
Родитель
Сommit
9f21dbbc5c
25 измененных файлов с 35 добавлено и 54 удалено
  1. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
  2. 1 3
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
  3. 2 4
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
  4. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
  5. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
  6. 1 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
  7. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
  8. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
  9. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
  10. 1 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
  11. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
  12. 0 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
  13. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
  14. 1 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
  15. 1 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
  16. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
  17. 1 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
  18. 1 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
  19. 1 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
  20. 1 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
  21. 14 3
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
  22. 0 2
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
  23. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
  24. 1 3
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
  25. 9 17
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysConfig;
4
 import com.ruoyi.system.domain.SysConfig;
6
 
5
 
7
 /**
6
 /**

+ 1 - 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -1,9 +1,7 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import org.apache.ibatis.annotations.Param;
4
 import org.apache.ibatis.annotations.Param;
6
-
7
 import com.ruoyi.system.api.domain.SysDept;
5
 import com.ruoyi.system.api.domain.SysDept;
8
 
6
 
9
 /**
7
 /**
@@ -28,7 +26,7 @@ public interface SysDeptMapper
28
      * @param deptCheckStrictly 部门树选择项是否关联显示
26
      * @param deptCheckStrictly 部门树选择项是否关联显示
29
      * @return 选中部门列表
27
      * @return 选中部门列表
30
      */
28
      */
31
-    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
29
+    public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
32
 
30
 
33
     /**
31
     /**
34
      * 根据部门ID查询信息
32
      * 根据部门ID查询信息

+ 2 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -1,9 +1,7 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import org.apache.ibatis.annotations.Param;
4
 import org.apache.ibatis.annotations.Param;
6
-
7
 import com.ruoyi.system.domain.SysMenu;
5
 import com.ruoyi.system.domain.SysMenu;
8
 
6
 
9
 /**
7
 /**
@@ -54,7 +52,7 @@ public interface SysMenuMapper
54
     /**
52
     /**
55
      * 根据用户ID查询菜单
53
      * 根据用户ID查询菜单
56
      * 
54
      * 
57
-     * @param username 用户ID
55
+     * @param userId 用户ID
58
      * @return 菜单列表
56
      * @return 菜单列表
59
      */
57
      */
60
     public List<SysMenu> selectMenuTreeByUserId(Long userId);
58
     public List<SysMenu> selectMenuTreeByUserId(Long userId);
@@ -66,7 +64,7 @@ public interface SysMenuMapper
66
      * @param menuCheckStrictly 菜单树选择项是否关联显示
64
      * @param menuCheckStrictly 菜单树选择项是否关联显示
67
      * @return 选中菜单列表
65
      * @return 选中菜单列表
68
      */
66
      */
69
-    public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
67
+    public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
70
 
68
 
71
     /**
69
     /**
72
      * 根据菜单ID查询信息
70
      * 根据菜单ID查询信息

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysNotice;
4
 import com.ruoyi.system.domain.SysNotice;
6
 
5
 
7
 /**
6
 /**

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.api.domain.SysOperLog;
4
 import com.ruoyi.system.api.domain.SysOperLog;
6
 
5
 
7
 /**
6
 /**

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysPost;
4
 import com.ruoyi.system.domain.SysPost;
6
 
5
 
7
 /**
6
 /**
@@ -40,7 +39,7 @@ public interface SysPostMapper
40
      * @param userId 用户ID
39
      * @param userId 用户ID
41
      * @return 选中岗位ID列表
40
      * @return 选中岗位ID列表
42
      */
41
      */
43
-    public List<Integer> selectPostListByUserId(Long userId);
42
+    public List<Long> selectPostListByUserId(Long userId);
44
 
43
 
45
     /**
44
     /**
46
      * 查询用户所属岗位组
45
      * 查询用户所属岗位组

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysRoleDept;
4
 import com.ruoyi.system.domain.SysRoleDept;
6
 
5
 
7
 /**
6
 /**

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.api.domain.SysRole;
4
 import com.ruoyi.system.api.domain.SysRole;
6
 
5
 
7
 /**
6
 /**

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysRoleMenu;
4
 import com.ruoyi.system.domain.SysRoleMenu;
6
 
5
 
7
 /**
6
 /**

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -18,6 +18,7 @@ public interface SysUserMapper
18
      * @return 用户信息集合信息
18
      * @return 用户信息集合信息
19
      */
19
      */
20
     public List<SysUser> selectUserList(SysUser sysUser);
20
     public List<SysUser> selectUserList(SysUser sysUser);
21
+
21
     /**
22
     /**
22
      * 根据条件分页查询未已配用户角色列表
23
      * 根据条件分页查询未已配用户角色列表
23
      * 
24
      * 

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysUserPost;
4
 import com.ruoyi.system.domain.SysUserPost;
6
 
5
 
7
 /**
6
 /**

+ 0 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -1,9 +1,7 @@
1
 package com.ruoyi.system.mapper;
1
 package com.ruoyi.system.mapper;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import org.apache.ibatis.annotations.Param;
4
 import org.apache.ibatis.annotations.Param;
6
-
7
 import com.ruoyi.system.domain.SysUserRole;
5
 import com.ruoyi.system.domain.SysUserRole;
8
 
6
 
9
 /**
7
 /**

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.service;
1
 package com.ruoyi.system.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysConfig;
4
 import com.ruoyi.system.domain.SysConfig;
6
 
5
 
7
 /**
6
 /**

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.service;
1
 package com.ruoyi.system.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.api.domain.SysDept;
4
 import com.ruoyi.system.api.domain.SysDept;
6
 import com.ruoyi.system.domain.vo.TreeSelect;
5
 import com.ruoyi.system.domain.vo.TreeSelect;
7
 
6
 
@@ -42,7 +41,7 @@ public interface ISysDeptService
42
      * @param roleId 角色ID
41
      * @param roleId 角色ID
43
      * @return 选中部门列表
42
      * @return 选中部门列表
44
      */
43
      */
45
-    public List<Integer> selectDeptListByRoleId(Long roleId);
44
+    public List<Long> selectDeptListByRoleId(Long roleId);
46
 
45
 
47
     /**
46
     /**
48
      * 根据部门ID查询信息
47
      * 根据部门ID查询信息

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -2,7 +2,6 @@ package com.ruoyi.system.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import java.util.Set;
4
 import java.util.Set;
5
-
6
 import com.ruoyi.system.domain.SysMenu;
5
 import com.ruoyi.system.domain.SysMenu;
7
 import com.ruoyi.system.domain.vo.RouterVo;
6
 import com.ruoyi.system.domain.vo.RouterVo;
8
 import com.ruoyi.system.domain.vo.TreeSelect;
7
 import com.ruoyi.system.domain.vo.TreeSelect;
@@ -53,7 +52,7 @@ public interface ISysMenuService
53
      * @param roleId 角色ID
52
      * @param roleId 角色ID
54
      * @return 选中菜单列表
53
      * @return 选中菜单列表
55
      */
54
      */
56
-    public List<Integer> selectMenuListByRoleId(Long roleId);
55
+    public List<Long> selectMenuListByRoleId(Long roleId);
57
 
56
 
58
     /**
57
     /**
59
      * 构建前端路由所需要的菜单
58
      * 构建前端路由所需要的菜单

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.service;
1
 package com.ruoyi.system.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysNotice;
4
 import com.ruoyi.system.domain.SysNotice;
6
 
5
 
7
 /**
6
 /**

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.system.service;
1
 package com.ruoyi.system.service;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import com.ruoyi.system.domain.SysPost;
4
 import com.ruoyi.system.domain.SysPost;
6
 
5
 
7
 /**
6
 /**
@@ -40,7 +39,7 @@ public interface ISysPostService
40
      * @param userId 用户ID
39
      * @param userId 用户ID
41
      * @return 选中岗位ID列表
40
      * @return 选中岗位ID列表
42
      */
41
      */
43
-    public List<Integer> selectPostListByUserId(Long userId);
42
+    public List<Long> selectPostListByUserId(Long userId);
44
 
43
 
45
     /**
44
     /**
46
      * 校验岗位名称
45
      * 校验岗位名称

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -144,6 +144,7 @@ public interface ISysRoleService
144
      * @return 结果
144
      * @return 结果
145
      */
145
      */
146
     public int deleteRoleByIds(Long[] roleIds);
146
     public int deleteRoleByIds(Long[] roleIds);
147
+
147
     /**
148
     /**
148
      * 取消授权用户角色
149
      * 取消授权用户角色
149
      * 
150
      * 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -127,7 +127,7 @@ public interface ISysUserService
127
      * @return 结果
127
      * @return 结果
128
      */
128
      */
129
     public int updateUser(SysUser user);
129
     public int updateUser(SysUser user);
130
-    
130
+
131
     /**
131
     /**
132
      * 用户授权角色
132
      * 用户授权角色
133
      * 
133
      * 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -100,7 +100,7 @@ public class SysDeptServiceImpl implements ISysDeptService
100
      * @return 选中部门列表
100
      * @return 选中部门列表
101
      */
101
      */
102
     @Override
102
     @Override
103
-    public List<Integer> selectDeptListByRoleId(Long roleId)
103
+    public List<Long> selectDeptListByRoleId(Long roleId)
104
     {
104
     {
105
         SysRole role = roleMapper.selectRoleById(roleId);
105
         SysRole role = roleMapper.selectRoleById(roleId);
106
         return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
106
         return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());

+ 14 - 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService
128
      * @return 选中菜单列表
128
      * @return 选中菜单列表
129
      */
129
      */
130
     @Override
130
     @Override
131
-    public List<Integer> selectMenuListByRoleId(Long roleId)
131
+    public List<Long> selectMenuListByRoleId(Long roleId)
132
     {
132
     {
133
         SysRole role = roleMapper.selectRoleById(roleId);
133
         SysRole role = roleMapper.selectRoleById(roleId);
134
         return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
134
         return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
@@ -179,7 +179,7 @@ public class SysMenuServiceImpl implements ISysMenuService
179
                 router.setPath("/inner");
179
                 router.setPath("/inner");
180
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
180
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
181
                 RouterVo children = new RouterVo();
181
                 RouterVo children = new RouterVo();
182
-                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
182
+                String routerPath = innerLinkReplaceEach(menu.getPath());
183
                 children.setPath(routerPath);
183
                 children.setPath(routerPath);
184
                 children.setComponent(UserConstants.INNER_LINK);
184
                 children.setComponent(UserConstants.INNER_LINK);
185
                 children.setName(StringUtils.capitalize(routerPath));
185
                 children.setName(StringUtils.capitalize(routerPath));
@@ -358,7 +358,7 @@ public class SysMenuServiceImpl implements ISysMenuService
358
         // 内链打开外网方式
358
         // 内链打开外网方式
359
         if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
359
         if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
360
         {
360
         {
361
-            routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
361
+            routerPath = innerLinkReplaceEach(routerPath);
362
         }
362
         }
363
         // 非外链并且是一级目录(类型为目录)
363
         // 非外链并且是一级目录(类型为目录)
364
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
364
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
@@ -500,4 +500,15 @@ public class SysMenuServiceImpl implements ISysMenuService
500
     {
500
     {
501
         return getChildList(list, t).size() > 0 ? true : false;
501
         return getChildList(list, t).size() > 0 ? true : false;
502
     }
502
     }
503
+
504
+    /**
505
+     * 内链域名特殊字符替换
506
+     * 
507
+     * @return
508
+     */
509
+    public String innerLinkReplaceEach(String path)
510
+    {
511
+        return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS },
512
+                new String[] { "", "" });
513
+    }
503
 }
514
 }

+ 0 - 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

@@ -1,10 +1,8 @@
1
 package com.ruoyi.system.service.impl;
1
 package com.ruoyi.system.service.impl;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.stereotype.Service;
5
 import org.springframework.stereotype.Service;
7
-
8
 import com.ruoyi.system.domain.SysNotice;
6
 import com.ruoyi.system.domain.SysNotice;
9
 import com.ruoyi.system.mapper.SysNoticeMapper;
7
 import com.ruoyi.system.mapper.SysNoticeMapper;
10
 import com.ruoyi.system.service.ISysNoticeService;
8
 import com.ruoyi.system.service.ISysNoticeService;

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -4,7 +4,6 @@ import java.util.HashSet;
4
 import java.util.Set;
4
 import java.util.Set;
5
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.stereotype.Service;
6
 import org.springframework.stereotype.Service;
7
-
8
 import com.ruoyi.system.api.domain.SysUser;
7
 import com.ruoyi.system.api.domain.SysUser;
9
 import com.ruoyi.system.service.ISysMenuService;
8
 import com.ruoyi.system.service.ISysMenuService;
10
 import com.ruoyi.system.service.ISysPermissionService;
9
 import com.ruoyi.system.service.ISysPermissionService;

+ 1 - 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -1,10 +1,8 @@
1
 package com.ruoyi.system.service.impl;
1
 package com.ruoyi.system.service.impl;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
-
5
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.stereotype.Service;
5
 import org.springframework.stereotype.Service;
7
-
8
 import com.ruoyi.common.core.constant.UserConstants;
6
 import com.ruoyi.common.core.constant.UserConstants;
9
 import com.ruoyi.common.core.exception.ServiceException;
7
 import com.ruoyi.common.core.exception.ServiceException;
10
 import com.ruoyi.common.core.utils.StringUtils;
8
 import com.ruoyi.common.core.utils.StringUtils;
@@ -69,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService
69
      * @return 选中岗位ID列表
67
      * @return 选中岗位ID列表
70
      */
68
      */
71
     @Override
69
     @Override
72
-    public List<Integer> selectPostListByUserId(Long userId)
70
+    public List<Long> selectPostListByUserId(Long userId)
73
     {
71
     {
74
         return postMapper.selectPostListByUserId(userId);
72
         return postMapper.selectPostListByUserId(userId);
75
     }
73
     }

+ 9 - 17
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -2,11 +2,13 @@ package com.ruoyi.system.service.impl;
2
 
2
 
3
 import java.util.ArrayList;
3
 import java.util.ArrayList;
4
 import java.util.List;
4
 import java.util.List;
5
+import java.util.stream.Collectors;
5
 import org.slf4j.Logger;
6
 import org.slf4j.Logger;
6
 import org.slf4j.LoggerFactory;
7
 import org.slf4j.LoggerFactory;
7
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.stereotype.Service;
9
 import org.springframework.stereotype.Service;
9
 import org.springframework.transaction.annotation.Transactional;
10
 import org.springframework.transaction.annotation.Transactional;
11
+import org.springframework.util.CollectionUtils;
10
 import com.ruoyi.common.core.constant.UserConstants;
12
 import com.ruoyi.common.core.constant.UserConstants;
11
 import com.ruoyi.common.core.exception.ServiceException;
13
 import com.ruoyi.common.core.exception.ServiceException;
12
 import com.ruoyi.common.core.utils.SpringUtils;
14
 import com.ruoyi.common.core.utils.SpringUtils;
@@ -127,16 +129,11 @@ public class SysUserServiceImpl implements ISysUserService
127
     public String selectUserRoleGroup(String userName)
129
     public String selectUserRoleGroup(String userName)
128
     {
130
     {
129
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
131
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
130
-        StringBuffer idsStr = new StringBuffer();
131
-        for (SysRole role : list)
132
+        if (CollectionUtils.isEmpty(list))
132
         {
133
         {
133
-            idsStr.append(role.getRoleName()).append(",");
134
+            return StringUtils.EMPTY;
134
         }
135
         }
135
-        if (StringUtils.isNotEmpty(idsStr.toString()))
136
-        {
137
-            return idsStr.substring(0, idsStr.length() - 1);
138
-        }
139
-        return idsStr.toString();
136
+        return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
140
     }
137
     }
141
 
138
 
142
     /**
139
     /**
@@ -149,16 +146,11 @@ public class SysUserServiceImpl implements ISysUserService
149
     public String selectUserPostGroup(String userName)
146
     public String selectUserPostGroup(String userName)
150
     {
147
     {
151
         List<SysPost> list = postMapper.selectPostsByUserName(userName);
148
         List<SysPost> list = postMapper.selectPostsByUserName(userName);
152
-        StringBuffer idsStr = new StringBuffer();
153
-        for (SysPost post : list)
149
+        if (CollectionUtils.isEmpty(list))
154
         {
150
         {
155
-            idsStr.append(post.getPostName()).append(",");
151
+            return StringUtils.EMPTY;
156
         }
152
         }
157
-        if (StringUtils.isNotEmpty(idsStr.toString()))
158
-        {
159
-            return idsStr.substring(0, idsStr.length() - 1);
160
-        }
161
-        return idsStr.toString();
153
+        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
162
     }
154
     }
163
 
155
 
164
     /**
156
     /**
@@ -179,7 +171,7 @@ public class SysUserServiceImpl implements ISysUserService
179
     }
171
     }
180
 
172
 
181
     /**
173
     /**
182
-     * 校验用户名称是否唯一
174
+     * 校验手机号码是否唯一
183
      *
175
      *
184
      * @param user 用户信息
176
      * @param user 用户信息
185
      * @return
177
      * @return