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 | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 0ade275..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
@@ -14,7 +14,6 @@
import com.sinata.system.domain.MwApplication;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.SysDepartmentInfo;
-import com.sinata.system.domain.SysUserDepartment;
import com.sinata.system.domain.dto.DisposalUnitDTO;
import com.sinata.system.domain.dto.MedicalInstitutionDTO;
import com.sinata.system.domain.dto.RegulatoryUnitDTO;
@@ -26,6 +25,7 @@
import com.sinata.system.domain.vo.SysDepartmentVO;
import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.mapper.SysDepartmentMapper;
+import com.sinata.system.service.ISysUserService;
import com.sinata.system.service.SysDepartmentInfoService;
import com.sinata.system.service.SysDepartmentService;
import com.sinata.system.service.SysUserDepartmentService;
@@ -60,6 +60,7 @@
private final SysUserDepartmentService sysUserDepartmentService;
private final RedisTemplate<Object, Object> redisTemplate;
private final SysDepartmentInfoService sysDepartmentInfoService;
+ private final ISysUserService sysUserService;
/**
* 获取区域树
* @return
@@ -87,6 +88,9 @@
break;
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);
@@ -135,6 +139,7 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentByOrgType(SysDepartment myDepartment, List<Integer> orgTypes) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .in(CollUtils.isNotEmpty(orgTypes), SysDepartment::getOrgType, orgTypes)
.likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
@@ -142,6 +147,15 @@
.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();
@@ -203,7 +217,7 @@
// if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
// return root;
// }
- Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
if (sysDepartmentVO.getTreeCode().length()==10){
SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
@@ -447,9 +461,9 @@
.orderByDesc(SysDepartment::getCreateTime)
.list();
List<Long> departmentIds = sysDepartmentList.stream().map(SysDepartment::getId).collect(Collectors.toList());
- Long count = sysUserDepartmentService.lambdaQuery().in(SysUserDepartment::getDepartmentId, departmentIds).count();
+ Long count = sysUserService.lambdaQuery().in(SysUser::getDepartmentId, departmentIds).count();
if (count > 0) {
- throw new ServiceException("该区域已存在用户，无法删除");
+ throw new ServiceException("该区域已关联用户，无法删除");
}
removeById(id);
}
@@ -622,9 +636,9 @@
*/
@Override
public void deleteMedical(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该医疗机构已存在用户，无法删除");
+ throw new ServiceException("该医疗机构已关联用户，无法删除");
}
removeById(id);
}
@@ -744,9 +758,9 @@
@Override
public void deleteDisposalUnit(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该处置单位构已存在用户，无法删除");
+ throw new ServiceException("该处置单位构已关联用户，无法删除");
}
removeById(id);
}
@@ -872,9 +886,9 @@
*/
@Override
public void deleteRegulatoryUnit(Long id) {
- Long count = sysUserDepartmentService.lambdaQuery().eq(SysUserDepartment::getDepartmentId, id).count();
+ Long count = sysUserService.lambdaQuery().eq(SysUser::getDepartmentId, id).count();
if (count > 0) {
- throw new ServiceException("该监管单位构已存在用户，无法删除");
+ throw new ServiceException("该监管单位构已关联用户，无法删除");
}
removeById(id);
}
--
Gitblit v1.7.1