From 9f9edf8cef1e65d7b31ed6cb0d6f0d4210d39384 Mon Sep 17 00:00:00 2001 From: "yunpeng.zhang" Date: Wed, 3 Jan 2024 15:10:55 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=83=A8=E9=97=A8=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 10 ++++++- .../com/eqc/system/mapper/SysDeptMapper.java | 9 ++++++ .../eqc/system/service/ISysDeptService.java | 14 ++++++++++ .../eqc/system/service/ISysUserService.java | 7 +++++ .../service/impl/EquipmentsServiceImpl.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 28 +++++++++++++++++++ .../service/impl/SysUserServiceImpl.java | 11 ++++++++ .../resources/mapper/system/SysDeptMapper.xml | 5 +++- 8 files changed, 83 insertions(+), 3 deletions(-) diff --git a/admin/src/main/java/com/eqc/web/controller/system/SysUserController.java b/admin/src/main/java/com/eqc/web/controller/system/SysUserController.java index b9f10d0..ef062c4 100644 --- a/admin/src/main/java/com/eqc/web/controller/system/SysUserController.java +++ b/admin/src/main/java/com/eqc/web/controller/system/SysUserController.java @@ -252,11 +252,19 @@ public class SysUserController extends BaseController { return R.ok(deptService.selectDeptTreeList(dept)); } + /** + * 获取部门树列表 + */ + @GetMapping("/deptTreeOption") + public R>> deptTreeOption() { + return R.ok(deptService.selectDeptTreeOption()); + } + /** * 获取用户列表 */ @GetMapping("/optionsSelect") public R> userOptions() { - return R.ok(userService.selectUserList(new SysUser())); + return R.ok(userService.selectUserOptions()); } } diff --git a/system/src/main/java/com/eqc/system/mapper/SysDeptMapper.java b/system/src/main/java/com/eqc/system/mapper/SysDeptMapper.java index ba7a453..060dabe 100644 --- a/system/src/main/java/com/eqc/system/mapper/SysDeptMapper.java +++ b/system/src/main/java/com/eqc/system/mapper/SysDeptMapper.java @@ -1,6 +1,7 @@ package com.eqc.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.eqc.common.annotation.DataColumn; import com.eqc.common.annotation.DataPermission; @@ -37,4 +38,12 @@ public interface SysDeptMapper extends BaseMapperPlus selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + /** + * 查询部门树结构信息 + * (不做数据权限校验，查询全部部门，用于下拉列表展示) + * + * @param queryWrapper 查询条件 + * @return 部门信息集合 + */ + List selectDeptOption(@Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/system/src/main/java/com/eqc/system/service/ISysDeptService.java b/system/src/main/java/com/eqc/system/service/ISysDeptService.java index b58dd53..907e958 100644 --- a/system/src/main/java/com/eqc/system/service/ISysDeptService.java +++ b/system/src/main/java/com/eqc/system/service/ISysDeptService.java @@ -113,4 +113,18 @@ public interface ISysDeptService { * @return 结果 */ int deleteDeptById(Long deptId); + + /** + * 查询所有部门 + * (不做数据权限校验，查询全部部门，用于下拉列表展示) + * @return 部门信息集合 + */ + List selectDeptOption(); + + /** + * 查询部门树结构信息 + * (不做数据权限校验，查询全部部门，用于下拉列表展示) + * @return 部门树信息集合 + */ + List> selectDeptTreeOption(); } diff --git a/system/src/main/java/com/eqc/system/service/ISysUserService.java b/system/src/main/java/com/eqc/system/service/ISysUserService.java index 922ddaa..bb18426 100644 --- a/system/src/main/java/com/eqc/system/service/ISysUserService.java +++ b/system/src/main/java/com/eqc/system/service/ISysUserService.java @@ -24,6 +24,13 @@ public interface ISysUserService { */ List selectUserList(SysUser user); + /** + * 查询所有用户 + * 不做数据权限范围控制 用于下拉列表的展示 + * @return 用户集合信息 + */ + List selectUserOptions(); + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/system/src/main/java/com/eqc/system/service/impl/EquipmentsServiceImpl.java b/system/src/main/java/com/eqc/system/service/impl/EquipmentsServiceImpl.java index 5fcd089..e169f16 100644 --- a/system/src/main/java/com/eqc/system/service/impl/EquipmentsServiceImpl.java +++ b/system/src/main/java/com/eqc/system/service/impl/EquipmentsServiceImpl.java @@ -56,7 +56,7 @@ public class EquipmentsServiceImpl implements IEquipmentsService { } private Map getDeptIdNameMap() { - List sysDepts = sysDeptService.selectDeptList(new SysDept()); + List sysDepts = sysDeptService.selectDeptOption(); return StreamUtils.toMap(sysDepts, SysDept::getDeptId, SysDept::getDeptName); } diff --git a/system/src/main/java/com/eqc/system/service/impl/SysDeptServiceImpl.java b/system/src/main/java/com/eqc/system/service/impl/SysDeptServiceImpl.java index 9493a0c..a1da1e3 100644 --- a/system/src/main/java/com/eqc/system/service/impl/SysDeptServiceImpl.java +++ b/system/src/main/java/com/eqc/system/service/impl/SysDeptServiceImpl.java @@ -306,4 +306,32 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return baseMapper.deleteById(deptId); } + /** + * 查询所有部门 + * (不做数据权限校验，查询全部部门，用于下拉列表展示) + * + * @return 部门信息集合 + */ + @Override + public List selectDeptOption() { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + // 只查询未禁用部门 + lqw.eq(SysDept::getDelFlag, "0") + .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) + .orderByAsc(SysDept::getParentId) + .orderByAsc(SysDept::getOrderNum); + return baseMapper.selectDeptOption(lqw); + } + + /** + * 查询部门树结构信息 + * (不做数据权限校验，查询全部部门，用于下拉列表展示) + * + * @return 部门树信息集合 + */ + @Override + public List> selectDeptTreeOption() { + List depts = this.selectDeptOption(); + return buildDeptTreeSelect(depts); + } } diff --git a/system/src/main/java/com/eqc/system/service/impl/SysUserServiceImpl.java b/system/src/main/java/com/eqc/system/service/impl/SysUserServiceImpl.java index 5444455..341ef29 100644 --- a/system/src/main/java/com/eqc/system/service/impl/SysUserServiceImpl.java +++ b/system/src/main/java/com/eqc/system/service/impl/SysUserServiceImpl.java @@ -71,6 +71,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return baseMapper.selectUserList(this.buildQueryWrapper(user)); } + /** + * 查询所有用户 + * 不做数据权限范围控制 用于下拉列表的展示 + * + * @return 用户集合信息 + */ + @Override + public List selectUserOptions() { + return baseMapper.selectList(); + } + private Wrapper buildQueryWrapper(SysUser user) { Map params = user.getParams(); QueryWrapper wrapper = Wrappers.query(); diff --git a/system/src/main/resources/mapper/system/SysDeptMapper.xml b/system/src/main/resources/mapper/system/SysDeptMapper.xml index 1e86a4b..5d7a7b9 100644 --- a/system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -36,5 +36,8 @@ order by d.parent_id, d.order_num +