From 3a3e27ebe0b706ac506e2e72f17ab58b4b848d03 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 6 Sep 2024 10:24:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=8F=98=E6=9B=B4=E7=94=A8=E6=88=B7=E7=BC=96=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/user/AdminUserServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 1952ebd9..79efbc86 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 @@ -31,7 +31,6 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.tenant.TenantService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.google.common.annotations.VisibleForTesting; import com.xingyuv.http.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -244,6 +243,16 @@ public class AdminUserServiceImpl implements AdminUserService { AdminUserDO updateObj = new AdminUserDO(); updateObj.setId(id); updateObj.setStatus(status); + switch (status) { + case 0: + // 开启状态 设置用户编制为在职 + updateObj.setUserStaffing(7); + break; + case 1: + // 关闭状态 设置用户编制为离职 + updateObj.setUserStaffing(8); + break; + } userMapper.updateById(updateObj); } From 24f05150a945f28490b6a5f8c9e60693211eaf0d Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 6 Sep 2024 10:25:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=99=9A=E6=9C=BA=E6=9E=84=E6=97=B6=EF=BC=8C=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=AE=8C=E6=AF=95=E5=AD=90=E9=83=A8=E9=97=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=90=8E=20=E5=86=8D=E7=A7=BB=E9=99=A4=E8=99=9A?= =?UTF-8?q?=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/dept/DeptController.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java index 1569ca15..44cd653f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java @@ -77,9 +77,6 @@ public class DeptController { .filter(dept -> dept.getVirtuallyStatus() == 1) .collect(Collectors.toList()); - // 移除虚机构，不展示 - list.removeIf(dept -> dept.getVirtuallyStatus() == 1); - virtuallyDeptId.forEach(data -> { // 将虚机构的子部门，父部门设置为虚机构的父部门 @@ -88,11 +85,23 @@ public class DeptController { .collect(Collectors.toList()); }); + + // 移除虚机构，不展示 + list.removeIf(dept -> dept.getVirtuallyStatus() == 1); } return success(BeanUtils.toBean(list, DeptRespVO.class)); } + @GetMapping(value = {"/get-list"}) + @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于添加部门下拉选项") + public CommonResult> getDeptList() { + List list = deptService.getDeptList( + new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + + return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); + } + @GetMapping(value = {"/list-all-simple", "/simple-list"}) @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") public CommonResult> getSimpleDeptList() { @@ -104,9 +113,6 @@ public class DeptController { .filter(dept -> dept.getVirtuallyStatus() == 1) .collect(Collectors.toList()); - // 移除虚机构，不展示 - list.removeIf(dept -> dept.getVirtuallyStatus() == 1); - virtuallyDeptId.forEach(data -> { // 将虚机构的子部门，父部门设置为虚机构的父部门 @@ -116,6 +122,9 @@ public class DeptController { }); + // 移除虚机构，不展示 + list.removeIf(dept -> dept.getVirtuallyStatus() == 1); + return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); } @@ -131,9 +140,6 @@ public class DeptController { .filter(dept -> dept.getVirtuallyStatus() == 1) .collect(Collectors.toList()); - // 移除虚机构，不展示 - list.removeIf(dept -> dept.getVirtuallyStatus() == 1); - virtuallyDeptId.forEach(data -> { // 将虚机构的子部门，父部门设置为虚机构的父部门 @@ -143,6 +149,9 @@ public class DeptController { }); + // 移除虚机构，不展示 + list.removeIf(dept -> dept.getVirtuallyStatus() == 1); + return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); }