From a8adc42f4be869c4e971e2310fa5cabc795b6d97 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 1 Nov 2024 15:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 18 +---- .../bonus/system/mapper/SysUserMapper.java | 7 -- .../bonus/system/service/ISysDeptService.java | 11 ---- .../service/impl/SysDeptServiceImpl.java | 41 ------------ .../resources/mapper/system/SysUserMapper.xml | 65 ------------------- 5 files changed, 2 insertions(+), 140 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index a945bd4..d6bbccc 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -449,26 +449,12 @@ public class SysUserController extends BaseController { return error("系统异常,请联系管理员"); } - /** - * 获取部门人员树列表 - */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) - @GetMapping("/deptUserTree") - public AjaxResult deptUserTree(SysDept dept) { - try { - return success(deptService.selectDeptUserTreeList(dept)); - } catch (Exception e) { - logger.error(e.toString(), e); - } - return error("系统异常,请联系管理员"); - } - /** * 根据角色列表获取部门人员树列表 */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) - @PostMapping("/deptUserTreeInRoleIds") - public AjaxResult deptUserTreeInRoleIds(@RequestBody SysUser sysUser) { + @PostMapping("/deptUserTree") + public AjaxResult deptUserTree(@RequestBody SysUser sysUser) { try { return success(deptService.selectDeptUserTree(sysUser.getRoleIds())); } catch (Exception e) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java index e5ff6fc..ce6fc0c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java @@ -157,11 +157,4 @@ public interface SysUserMapper { Integer approvalStatus(Long userId); - /** - * 组织人员树 - * @param dept - * @return - */ - List getTree(SysDept dept); - } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java index 580b724..ef90ed8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java @@ -27,23 +27,12 @@ public interface ISysDeptService */ public List selectDeptTreeList(SysDept dept); - /** - * 查询部门人员树结构信息 - * - * @param dept 部门信息 - * @return 部门树信息集合 - */ - public List selectDeptUserTreeList(SysDept dept); - /** * 根据角色列表查询部门人员树结构信息 * - * @param dept 部门信息 * @param roleIds 角色列表 * @return 部门树信息集合 */ - public List selectDeptUserTree(SysDept dept, List roleIds); - public List selectDeptUserTree(Long[] roleIds); /** diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java index 3449e86..9e375b4 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java @@ -78,18 +78,9 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 根据角色列表查询部门人员树结构信息 * - * @param dept 部门信息 * @param roleIds 角色列表 * @return 部门树信息集合 */ - @Override - @DataScope(deptAlias = "d") - public List selectDeptUserTree(SysDept dept, List roleIds) - { - List depts = deptMapper.selectDeptUserList(dept, roleIds); - return buildDeptTreeSelect(depts); - } - @Override @DataScope(deptAlias = "d") public List selectDeptUserTree(Long[] roleIds) @@ -98,38 +89,6 @@ public class SysDeptServiceImpl implements ISysDeptService return buildDeptTreeSelect(depts); } - /** - * 查询部门人员树结构信息 - * - * @param dept 部门信息 - * @return 部门树信息集合 - */ - @Override - public List selectDeptUserTreeList(SysDept dept) - { - if (dept != null && dept.getDeptId() != null && dept.getDeptId() == 0L) { - List userList = userMapper.getTree(dept); - return buildDeptTreeSelect(userList); - } - List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); -// for (SysDept sysDept : depts) { -// SysUser paramUser = new SysUser(); -// paramUser.setDeptId(sysDept.getDeptId()); -// List users = userMapper.selectUserList(paramUser); -// -// List sysUsers = new ArrayList<>(); -// for (SysUser user : users) { -// SysUser userResult = userMapper.selectUserById(user.getUserId()); -// user.setRoles(userResult.getRoles()); -// if (user.getDeptId().equals(sysDept.getDeptId())) { -// sysUsers.add(user); -// } -// } -// sysDept.setSysUsers(sysUsers); -// } - return buildDeptTreeSelect(depts); - } - /** * 构建前端所需要树结构 * diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 444eef4..7960e3d 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -202,71 +202,6 @@ and del_flag = '0' limit 1 - - - - insert into sys_user( user_id,