From f873ace4034b5f868824ee60959f97f8aef7c0a6 Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 31 Oct 2025 09:16:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A2=86=E5=AF=BC=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 38 +++++++++++++++---- .../ruoyi/system/mapper/SysUserMapper.java | 2 + .../ruoyi/system/service/ISysUserService.java | 2 + .../service/impl/SysUserServiceImpl.java | 24 ++++++++---- .../resources/mapper/system/SysUserMapper.xml | 26 +++++++++++-- 5 files changed, 74 insertions(+), 18 deletions(-) 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 04940ba..0364577 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 @@ -64,6 +64,17 @@ public class SysUserController extends BaseController List list = userService.selectUserList(user); return getDataTable(list); } + /** + * 获取领导账号列表 + */ + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/ldUserlist") + public TableDataInfo ldUserlist(SysUser user) + { + startPage(); + List list = userService.selectldUserlist(user); + return getDataTable(list); + } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @@ -176,12 +187,25 @@ public class SysUserController extends BaseController nuser.setPassword(SecurityUtils.encryptPassword("111111")); nuser.setUserName(account); nuser.setNickName(account); - nuser.setPcId(user.getPcId()); - nuser.setPcIds(String.join(",",user.getPcIds())); - nuser.setPcNames(String.join(",",user.getPcNames())); - nuser.setVoteIds(String.join(",",user.getVoteIds())); - nuser.setItemIds(String.join(",",user.getItemIds())); - nuser.setItemNames(String.join(",",user.getItemNames())); + + if(user.getPcId()!=null){ + nuser.setPcId(user.getPcId()); + } + if(user.getPcIds()!=null){ + nuser.setPcIds(String.join(",",user.getPcIds())); + } + if(user.getPcNames()!=null){ + nuser.setPcNames(String.join(",",user.getPcNames())); + } + if(user.getItemIds()!=null){ + nuser.setItemIds(String.join(",",user.getItemIds())); + } + if(user.getVoteIds()!=null){ + nuser.setVoteIds(String.join(",",user.getVoteIds())); + } + if(user.getItemNames()!=null){ + nuser.setItemNames(String.join(",",user.getItemNames())); + } nuser.setCreateBy(getUsername()); nuser.setRoleIds(roleIds); nuser.setDeptId(user.getDeptId()); @@ -241,7 +265,7 @@ public class SysUserController extends BaseController * 根据考核任务id删除用户 */ @PreAuthorize("@ss.hasPermi('system:user:remove')") - @Log(title = "用户管理", businessType = BusinessType.DELETE) + @Log(title = "评分账号", businessType = BusinessType.DELETE) @DeleteMapping("/pcIds/{pcIds}") public AjaxResult removeBypcIds(@PathVariable Long[] pcIds) { 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 ae7cb84..22eb59c 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 @@ -126,4 +126,6 @@ public interface SysUserMapper public SysUser checkEmailUnique(String email); int deleteUserByPcIds(Long[] pcIds); + + List selectldUserlist(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 54ddaed..22f5bad 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 @@ -205,4 +205,6 @@ public interface ISysUserService public String importUser(List userList, Boolean isUpdateSupport, String operName); int deleteUserByPcIds(Long[] pcIds); + + List selectldUserlist(SysUser user); } 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 2788541..35669a0 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 @@ -78,6 +78,12 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectUserList(user); } + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectldUserlist(SysUser user) { + return userMapper.selectldUserlist(user); + } + /** * 根据条件分页查询已分配用户角色列表 * @@ -482,15 +488,17 @@ public class SysUserServiceImpl implements ISysUserService param.setPcId(pcId); List sysUsers = userMapper.selectUserList(param); List userIds = sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()); - for (Long userId : userIds) - { - checkUserAllowed(new SysUser(userId)); - checkUserDataScope(userId); + if(userIds!=null&&userIds.size()>0){ + for (Long userId : userIds) + { + checkUserAllowed(new SysUser(userId)); + checkUserDataScope(userId); + } + // 删除用户与角色关联 + userRoleMapper.deleteUserRole(userIds.stream().toArray(Long[]::new)); + // 删除用户与岗位关联 + userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new)); } - // 删除用户与角色关联 - userRoleMapper.deleteUserRole(userIds.stream().toArray(Long[]::new)); - // 删除用户与岗位关联 - userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new)); } return userMapper.deleteUserByPcIds(pcIds); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 6a014c4..1219afe 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.user_name like concat('%', #{userName}, '%') AND u.pc_id = #{pcId} + AND u.status = #{status} @@ -93,6 +94,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + + + + +