From ea0d7222f94c667211227f5b11083c656e8f3736 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Tue, 18 Feb 2025 16:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E6=8A=8A=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E4=BA=86=E7=A7=91=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectDepartmentService.java | 4 ++++ .../InspectDepartmentServiceImpl.java | 11 +++++++++++ .../yudao-module-system-biz/pom.xml | 6 ++++++ .../controller/admin/user/UserController.java | 18 +++++++++++++----- .../system/convert/user/UserConvert.java | 14 +++++++++++++- .../service/user/AdminUserServiceImpl.java | 8 ++++---- 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentService.java index 95bd288..1278de2 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentService.java @@ -56,4 +56,8 @@ public interface InspectDepartmentService { 获取所有的科室集合 * */ List getListDepartment(); + /* + * 获取科室信息组 + * */ + List getDeptList(Collection ids); } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentServiceImpl.java index 1e8750d..8623043 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectdepartment/InspectDepartmentServiceImpl.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.inspect.service.inspectdepartment; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -76,4 +78,13 @@ public class InspectDepartmentServiceImpl implements InspectDepartmentService { { return departmentMapper.selectList(null); } + @Override + public List getDeptList(Collection ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyList(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("departmentCode", ids); // + return departmentMapper.selectList(queryWrapper); + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index 3d506a0..dbd417f 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -107,6 +107,12 @@ com.xingyuv spring-boot-starter-captcha-plus + + cn.iocoder.boot + yudao-module-inspect-biz + 2.4.1-jdk8-SNAPSHOT + compile + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 3f7dc61..e0da587 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -6,7 +6,10 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectdepartment.InspectDepartmentDO; +import cn.iocoder.yudao.module.inspect.service.inspectdepartment.InspectDepartmentService; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.module.system.convert.user.UserConvert; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; @@ -45,7 +48,8 @@ public class UserController { private AdminUserService userService; @Resource private DeptService deptService; - + @Resource + private InspectDepartmentService departmentService; @PostMapping("/create") @Operation(summary = "新增用户") @PreAuthorize("@ss.hasPermission('system:user:create')") @@ -96,10 +100,14 @@ public class UserController { if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); } - // 拼接数据 - Map deptMap = deptService.getDeptMap( - convertList(pageResult.getList(), AdminUserDO::getDeptId)); - return success(new PageResult<>(UserConvert.INSTANCE.convertList(pageResult.getList(), deptMap), + // 拼接自己的科室数据 + List list = departmentService.getDeptList(convertList(pageResult.getList(), AdminUserDO::getDeptId)); + Map deptMap = CollectionUtils.convertMap(list, InspectDepartmentDO::getDepartmentCode); + + // 框架原本的拼接数据 +// Map deptMap = deptService.getDeptMap( +// convertList(pageResult.getList(), AdminUserDO::getDeptId)); + return success(new PageResult<>(UserConvert.INSTANCE.convertdeptList(pageResult.getList(), deptMap), pageResult.getTotal())); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java index b58be21..a20a8a4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.convert.user; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectdepartment.InspectDepartmentDO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSimpleRespVO; import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO; @@ -28,7 +29,9 @@ public interface UserConvert { default List convertList(List list, Map deptMap) { return CollectionUtils.convertList(list, user -> convert(user, deptMap.get(user.getDeptId()))); } - + default List convertdeptList(List list, Map deptMap) { + return CollectionUtils.convertList(list, user -> convertdept(user, deptMap.get(String.valueOf(user.getDeptId())))); + } default UserRespVO convert(AdminUserDO user, DeptDO dept) { UserRespVO userVO = BeanUtils.toBean(user, UserRespVO.class); if (dept != null) { @@ -36,6 +39,15 @@ public interface UserConvert { } return userVO; } + default UserRespVO convertdept(AdminUserDO user, InspectDepartmentDO dept) { + UserRespVO userVO = BeanUtils.toBean(user, UserRespVO.class); + if (dept != null) { + userVO.setDeptName(dept.getDepartmentName()); + } + return userVO; + } + + default List convertSimpleList(List list, Map deptMap) { return CollectionUtils.convertList(list, user -> { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 040802c..61d8164 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -364,10 +364,10 @@ public class AdminUserServiceImpl implements AdminUserService { validateMobileUnique(id, mobile); // 校验邮箱唯一 validateEmailUnique(id, email); - // 校验部门处于开启状态 - deptService.validateDeptList(CollectionUtils.singleton(deptId)); - // 校验岗位处于开启状态 - postService.validatePostList(postIds); + // 校验部门处于开启状态 部门改成科室 修改新增不在校验 + // deptService.validateDeptList(CollectionUtils.singleton(deptId)); + // 校验岗位处于开启状态 岗位同理 + // postService.validatePostList(postIds); return user; }); }