From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 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 bd1c738..3ce68a4 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
@@ -4,15 +4,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.constant.CacheConstants;
+import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
+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;
@@ -24,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;
@@ -58,6 +60,7 @@
private final SysUserDepartmentService sysUserDepartmentService;
private final RedisTemplate<Object, Object> redisTemplate;
private final SysDepartmentInfoService sysDepartmentInfoService;
+ private final ISysUserService sysUserService;
/**
* 获取区域树
* @return
@@ -90,8 +93,39 @@
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
}
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(myDepartment, childrenMap);
+ switch (type) {
+ case 2:
+ case 3:
+ case 4:
+ filterEmptyChildren(sysDepartmentVO.getChildren());
+ break;
+ }
root.add(sysDepartmentVO);
return root;
+ }
+
+ /**
+ * 移除子节点为空的区域
+ *
+ * @param departments
+ */
+ private void filterEmptyChildren(List<SysDepartmentVO> departments) {
+ if (departments == null) {
+ return;
+ }
+
+ Iterator<SysDepartmentVO> iterator = departments.iterator();
+ while (iterator.hasNext()) {
+ SysDepartmentVO department = iterator.next();
+
+ // 递归过滤子节点
+ filterEmptyChildren(department.getChildren());
+
+ // 如果 orgType == 1 且 children 为空，则移除当前节点
+ if (department.getOrgType() == 1 && department.getChildren().isEmpty()) {
+ iterator.remove();
+ }
+ }
}
/**
@@ -124,6 +158,45 @@
public List<SysDepartmentVO> getRegionTree(String keyword) {
List<SysDepartmentVO> root = new ArrayList<>();
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()));
+ SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ root.add(sysDepartmentVO);
+ if (StringUtils.isNotBlank(keyword)) {
+ treeMatch(root, keyword);
+ }
+ return root;
+ }
+ @Override
+ public List<SysDepartmentVO> getRegionTree1(String keyword) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+
+ List<SysDepartmentVO> root = new ArrayList<>();
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysUser.getDepartmentId());
+ SysDepartment currentDepartment = this.baseMapper.selectById(sysDepartment.getParentId());
+ 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()));
+ SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ root.add(sysDepartmentVO);
+ if (StringUtils.isNotBlank(keyword)) {
+ treeMatch(root, keyword);
+ }
+ return root;
+ }
+ public List<SysDepartmentVO> getRegionTree2(String keyword) {
+
+ List<SysDepartmentVO> root = new ArrayList<>();
+ SysDepartment currentDepartment = this.baseMapper.selectById(-1);
if (Objects.isNull(currentDepartment)) {
return root;
}
@@ -348,9 +421,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);
}
@@ -443,7 +516,8 @@
* @param department
* @return
*/
- private String getRegionName(SysDepartment department) {
+ @Override
+ public String getRegionName(SysDepartment department) {
String region = department.getDepartmentName();
SysDepartment sysDepartment = this.lambdaQuery().eq(SysDepartment::getId, department.getParentId()).ne(SysDepartment::getId, -1).one();
if (Objects.nonNull(sysDepartment)) {
@@ -522,9 +596,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);
}
@@ -644,9 +718,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);
}
@@ -668,6 +742,7 @@
.like(StringUtils.isNotEmpty(query.getDepartmentName()), SysDepartment::getDepartmentName, query.getDepartmentName())
.like(StringUtils.isNotBlank(query.getContactPerson()), SysDepartment::getContactPerson, query.getContactPerson())
.like(StringUtils.isNotBlank(query.getContactPhone()), SysDepartment::getContactPhone, query.getContactPhone())
+ .eq(SysDepartment::getOrgType, DepartmentEnum.REGULATORY_UNIT.getCode())
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
return PageDTO.of(page, RegulatoryUnitVO.class);
}
@@ -771,9 +846,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);
}
@@ -808,4 +883,28 @@
public List<MedicalInstitutionVO> getHospitalListByRouteId(Long id) {
return baseMapper.getHospitalListByRouteId(id);
}
+
+ /**
+ * 创建机构
+ *
+ * @param mwApplication
+ */
+ @Override
+ public void createDepartment(MwApplication mwApplication) {
+ SysDepartment parent = this.getById(mwApplication.getDepartmentId());
+ if (Objects.isNull(parent)) {
+ throw new ServiceException("找不到对应父级组织");
+ }
+ SysDepartment department = new SysDepartment();
+ department.setParentId(mwApplication.getDepartmentId());
+ department.setDepartmentName(mwApplication.getUnitName());
+ department.setContactPerson(mwApplication.getConcat());
+ department.setContactPhone(mwApplication.getPhone());
+ department.setOrgType(mwApplication.getUnitType().equals(1) ? DepartmentEnum.MEDICAL_INSTITUTION.getCode() : DepartmentEnum.DISPOSAL_UNIT.getCode());
+ department.setRegion(mwApplication.getRegion());
+ department.setRelation(mwApplication.getRelation());
+ department.setTreeCode(generateTreeCode(parent.getId()));
+ department.setOrgCode(getOrgCode(parent.getId(), department.getOrgType()));
+ save(department);
+ }
}
--
Gitblit v1.7.1