ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/zn-cloud/server into dev

Browse Source
This commit is contained in:
aikai 2024-09-06 18:14:34 +08:00
commit 48b64afa14
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
View File

@ -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<List<DeptSimpleRespVO>> getDeptList() {
List<DeptDO> 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<List<DeptSimpleRespVO>> 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));
}

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View File

@ -247,6 +247,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);
}