Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

冀北电网一张图功能调整

Browse Source
This commit is contained in:
xy
2024-05-03 17:18:42 +08:00
parent e781274479
commit 34b4b8882d
8 changed files with 245 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/DeptTreeVO.java
View File

@@ -38,6 +38,7 @@ public class DeptTreeVO extends BaseVO {
@ApiModelProperty("排序")
private Integer sort;
@ApiModelProperty("部门等级 0:全国 1:省 2:市 3:县")
private Integer level;
@ApiModelProperty("子节点详细信息")

2
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -522,7 +522,7 @@ public class UserController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_SERIOUS)
@GetMapping("/getUserByRoleType")
@ApiOperation("根据角色类型获取用户")
@ApiImplicitParam(name = "roleCode", value = "角色类型", required = true)
@ApiImplicitParam(name = "roleType", value = "角色类型", required = true)
public HttpResult<List<User>> getUserByRoleType(@RequestParam("roleType") Integer roleType) {
String methodDescribe = getMethodDescribe("getUserByRoleType");
List<User> users = userService.getUserByRoleType(roleType);

6
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -170,6 +170,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
return deptList.stream()
.filter(deptVO -> deptVO.getId().equals(deptIndex))
.peek(deptFirst -> {
if (!Objects.isNull(deptFirst.getPid())){
deptFirst.setLevel(deptFirst.getPids().split(",").length - 1);
}
deptFirst.setChildren(getChildren(deptFirst, deptList));
})
.collect(Collectors.toList());
@@ -369,6 +372,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
private List<DeptTreeVO> getChildren(DeptTreeVO deptFirst, List<DeptTreeVO> allDept) {
return allDept.stream().filter(dept -> dept.getPid().equals(deptFirst.getId()))
.peek(deptVo -> {
if (!Objects.isNull(deptVo.getPids())) {
deptVo.setLevel(deptVo.getPids().split(",").length - 1);
}
deptVo.setChildren(getChildren(deptVo, allDept));
if (deptVo.getType() == 0) {
deptVo.setName(deptVo.getAreaName());