From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index 3ce68a4..89a7ca4 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -89,6 +89,9 @@
case 4:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
break;
+ case 5:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
+ break;
default:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
}
@@ -136,14 +139,23 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentByOrgType(SysDepartment myDepartment, List<Integer> orgTypes) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
- .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.in(CollUtils.isNotEmpty(orgTypes), SysDepartment::getOrgType, orgTypes)
+ .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
return sysDepartmentList.stream()
.collect(Collectors.groupingBy(SysDepartment::getParentId));
}
+ @NotNull
+ private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
+ List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
+ .orderByDesc(SysDepartment::getCreateTime)
+ .list();
+ return sysDepartmentList.stream()
+ .collect(Collectors.groupingBy(SysDepartment::getParentId));
+ }
@Override
public SysDepartment getDepartmentByParentId(Long parentId) {
return this.lambdaQuery().eq(SysDepartment::getId, parentId).one();
@@ -195,16 +207,44 @@
}
public List<SysDepartmentVO> getRegionTree2(String keyword) {
+// SysDepartment currentDepartment = getMyDepartment();
+
List<SysDepartmentVO> root = new ArrayList<>();
- SysDepartment currentDepartment = this.baseMapper.selectById(-1);
+ SysDepartment currentDepartment = getMyDepartment();
if (Objects.isNull(currentDepartment)) {
return root;
}
- if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
- return root;
- }
- Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+// if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
+// return root;
+// }
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ if (sysDepartmentVO.getTreeCode().length()==10){
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
+ SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
+ List<SysDepartmentVO> root1 = new ArrayList<>();
+ root1.add(sysDepartmentVO);
+ sysDepartmentVO1.setChildren(root1);
+ sysDepartmentVO = sysDepartmentVO1;
+ }
+ if (sysDepartmentVO.getTreeCode().length()==14){
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
+ SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
+ List<SysDepartmentVO> root1 = new ArrayList<>();
+ root1.add(sysDepartmentVO);
+ sysDepartmentVO1.setChildren(root1);
+
+
+ SysDepartment sysDepartment2 = this.baseMapper.selectById(sysDepartment.getParentId());
+ SysDepartmentVO sysDepartmentVO2 = new SysDepartmentVO();
+ BeanUtils.copyProperties(sysDepartment2,sysDepartmentVO2);
+ List<SysDepartmentVO> root2 = new ArrayList<>();
+ root2.add(sysDepartmentVO1);
+ sysDepartmentVO2.setChildren(root2);
+ sysDepartmentVO = sysDepartmentVO2;
+ }
root.add(sysDepartmentVO);
if (StringUtils.isNotBlank(keyword)) {
treeMatch(root, keyword);
--
Gitblit v1.7.1