From 59114a14ffc153812b6df1d912a67887d8dfb492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 6 Jul 2021 13:05:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8C=E6=AD=A5=20ruoyi=20=E5=AF=B9?= =?UTF-8?q?=E6=96=B0=E4=B8=9A=E5=8A=A1=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysRoleController.java | 8 +- .../controller/system/SysUserController.java | 4 +- .../ruoyi/system/mapper/SysUserMapper.java | 4 +- .../ruoyi/system/service/ISysUserService.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 36 ++- .../service/impl/SysUserServiceImpl.java | 31 +-- .../resources/mapper/system/SysUserMapper.xml | 30 +-- ruoyi-ui/src/views/system/user/authRole.vue | 234 +++++++++--------- 8 files changed, 169 insertions(+), 182 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index c36c3e6f..4661d02d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -181,9 +181,7 @@ public class SysRoleController extends BaseController @GetMapping("/authUser/allocatedList") public TableDataInfo allocatedList(SysUser user) { - startPage(); - List list = userService.selectAllocatedList(user); - return getDataTable(list); + return userService.selectAllocatedList(user); } /** @@ -193,9 +191,7 @@ public class SysRoleController extends BaseController @GetMapping("/authUser/unallocatedList") public TableDataInfo unallocatedList(SysUser user) { - startPage(); - List list = userService.selectUnallocatedList(user); - return getDataTable(list); + return userService.selectUnallocatedList(user); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 00599932..a67615f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -204,12 +204,12 @@ public class SysUserController extends BaseController @GetMapping("/authRole/{userId}") public AjaxResult authRole(@PathVariable("userId") Long userId) { - AjaxResult ajax = AjaxResult.success(); SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); + Map ajax = new HashMap<>(); ajax.put("user", user); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - return ajax; + return AjaxResult.success(ajax); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 144cee39..e4276c8f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -30,7 +30,7 @@ public interface SysUserMapper extends BaseMapperPlus { * @param user 用户信息 * @return 用户信息集合信息 */ - public List selectAllocatedList(SysUser user); + public List selectAllocatedList(@Param("page") Page page, @Param("user") SysUser user); /** * 根据条件分页查询未分配用户角色列表 @@ -38,7 +38,7 @@ public interface SysUserMapper extends BaseMapperPlus { * @param user 用户信息 * @return 用户信息集合信息 */ - public List selectUnallocatedList(SysUser user); + public List selectUnallocatedList(@Param("page") Page page, @Param("user") SysUser user); /** * 通过用户名查询用户 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index e4eafc51..e277d108 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -30,7 +30,7 @@ public interface ISysUserService extends IServicePlus { * @param user 用户信息 * @return 用户信息集合信息 */ - public List selectAllocatedList(SysUser user); + public TableDataInfo selectAllocatedList(SysUser user); /** * 根据条件分页查询未分配用户角色列表 @@ -38,7 +38,7 @@ public interface ISysUserService extends IServicePlus { * @param user 用户信息 * @return 用户信息集合信息 */ - public List selectUnallocatedList(SysUser user); + public TableDataInfo selectUnallocatedList(SysUser user); /** * 通过用户名查询用户 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index e04fdcfc..df024ae6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -66,16 +66,12 @@ public class SysRoleServiceImpl extends ServicePlusImpl * @return 角色列表 */ @Override - public List selectRolesByUserId(Long userId) - { - List userRoles = roleMapper.selectRolePermissionByUserId(userId); + public List selectRolesByUserId(Long userId) { + List userRoles = baseMapper.selectRolePermissionByUserId(userId); List roles = selectRoleAll(); - for (SysRole role : roles) - { - for (SysRole userRole : userRoles) - { - if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) - { + for (SysRole role : roles) { + for (SysRole userRole : userRoles) { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) { role.setFlag(true); break; } @@ -338,9 +334,10 @@ public class SysRoleServiceImpl extends ServicePlusImpl * @return 结果 */ @Override - public int deleteAuthUser(SysUserRole userRole) - { - return userRoleMapper.deleteUserRoleInfo(userRole); + public int deleteAuthUser(SysUserRole userRole) { + return userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysUserRole::getRoleId, userRole.getRoleId()) + .eq(SysUserRole::getUserId, userRole.getUserId())); } /** @@ -351,9 +348,10 @@ public class SysRoleServiceImpl extends ServicePlusImpl * @return 结果 */ @Override - public int deleteAuthUsers(Long roleId, Long[] userIds) - { - return userRoleMapper.deleteUserRoleInfos(roleId, userIds); + public int deleteAuthUsers(Long roleId, Long[] userIds) { + return userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysUserRole::getRoleId, roleId) + .in(SysUserRole::getUserId, Arrays.asList(userIds))); } /** @@ -364,17 +362,15 @@ public class SysRoleServiceImpl extends ServicePlusImpl * @return 结果 */ @Override - public int insertAuthUsers(Long roleId, Long[] userIds) - { + public int insertAuthUsers(Long roleId, Long[] userIds) { // 新增用户与角色管理 List list = new ArrayList(); - for (Long userId : userIds) - { + for (Long userId : userIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); list.add(ur); } - return userRoleMapper.batchUserRole(list); + return userRoleMapper.insertAll(list); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index fb47f625..36de18db 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -76,10 +76,9 @@ public class SysUserServiceImpl extends ServicePlusImpl * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { - return userMapper.selectAllocatedList(user); + @DataScope(deptAlias = "d", userAlias = "u", isUser = true) + public TableDataInfo selectAllocatedList(SysUser user) { + return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user)); } /** @@ -89,10 +88,9 @@ public class SysUserServiceImpl extends ServicePlusImpl * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { - return userMapper.selectUnallocatedList(user); + @DataScope(deptAlias = "d", userAlias = "u", isUser = true) + public TableDataInfo selectUnallocatedList(SysUser user) { + return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user)); } /** @@ -266,7 +264,8 @@ public class SysUserServiceImpl extends ServicePlusImpl @Override public void insertUserAuth(Long userId, Long[] roleIds) { - userRoleMapper.deleteUserRoleByUserId(userId); + userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysUserRole::getUserId, userId)); insertUserRole(userId, roleIds); } @@ -383,22 +382,18 @@ public class SysUserServiceImpl extends ServicePlusImpl * @param userId 用户ID * @param roleIds 角色组 */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotNull(roleIds)) - { + public void insertUserRole(Long userId, Long[] roleIds) { + if (Validator.isNotNull(roleIds)) { // 新增用户与角色管理 List list = new ArrayList(); - for (Long roleId : roleIds) - { + for (Long roleId : roleIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); list.add(ur); } - if (list.size() > 0) - { - userRoleMapper.batchUserRole(list); + if (list.size() > 0) { + userRoleMapper.insertAll(list); } } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 236ae20b..5e112781 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -148,16 +148,16 @@ 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' and r.role_id = #{roleId} - - AND u.user_name like concat('%', #{userName}, '%') + where u.del_flag = '0' and r.role_id = #{user.roleId} + + AND u.user_name like concat('%', #{user.userName}, '%') - - AND u.phonenumber like concat('%', #{phonenumber}, '%') + + AND u.phonenumber like concat('%', #{user.phonenumber}, '%') - - AND ( ${params.dataScope} ) + + AND ( ${user.params.dataScope} ) @@ -167,17 +167,17 @@ 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' and (r.role_id != #{roleId} or r.role_id IS NULL) - and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) - - AND u.user_name like concat('%', #{userName}, '%') + where u.del_flag = '0' and (r.role_id != #{user.roleId} or r.role_id IS NULL) + and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{user.roleId}) + + AND u.user_name like concat('%', #{user.userName}, '%') - - AND u.phonenumber like concat('%', #{phonenumber}, '%') + + AND u.phonenumber like concat('%', #{user.phonenumber}, '%') - - AND ( ${params.dataScope} ) + + AND ( ${user.params.dataScope} ) diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue index e0cd7bce..8e7f82a9 100644 --- a/ruoyi-ui/src/views/system/user/authRole.vue +++ b/ruoyi-ui/src/views/system/user/authRole.vue @@ -1,117 +1,117 @@ - - - \ No newline at end of file + + +