From bd6d42818da5b2551eba1884744f28a42720987d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 24 十二月 2024 10:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java |   26 ++++++++++++++++----------
 1 files changed, 16 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 d5eb7ec..b796fc1 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
@@ -223,7 +223,7 @@
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
         //获取部门树编码
         department.setOrgType(DepartmentEnum.REGION.getCode());
-        department.setTreeCode(getTreeCode(dto.getParentId()));
+        department.setTreeCode(generateTreeCode(dto.getParentId()));
         department.setOrgCode(getOrgCode(dto.getParentId(), DepartmentEnum.REGION.getCode()));
         save(department);
     }
@@ -258,7 +258,7 @@
         SysDepartment sysDepartment = getById(dto.getId());
         if (!dto.getParentId().equals(sysDepartment.getParentId())) {
             //获取部门树编码
-            department.setTreeCode(getTreeCode(dto.getParentId()));
+            department.setTreeCode(generateTreeCode(dto.getParentId()));
         }
         updateById(department);
     }
@@ -270,7 +270,7 @@
      * @return
      */
     @Override
-    public String getTreeCode(Long parentId) {
+    public String generateTreeCode(Long parentId) {
 
         String treeId;
         String preTreeCode = "";
@@ -397,7 +397,7 @@
             throw new ServiceException("医疗机构已存在");
         }
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
-        department.setTreeCode(getTreeCode(parent.getId()));
+        department.setTreeCode(generateTreeCode(parent.getId()));
         department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.MEDICAL_INSTITUTION.getCode()));
         department.setOrgType(DepartmentEnum.MEDICAL_INSTITUTION.getCode());
         //查询父级完整区域
@@ -409,6 +409,12 @@
         sysDepartmentInfoService.save(sysDepartmentInfo);
     }
 
+    /**
+     * 根据父级区域id查询处置单位列表
+     *
+     * @param id
+     * @return
+     */
     @Override
     public List<DisposalUnitVO> getDisposalUnitListByParentId(Long id) {
         List<DisposalUnitVO> disposalUnitList = null;
@@ -421,7 +427,7 @@
     }
 
     /**
-     * 获取完成区域
+     * 获取完整区域
      *
      * @param department
      * @return
@@ -471,7 +477,7 @@
         }
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
         if (!department.getParentId().equals(sysDepartment.getParentId())) {
-            department.setTreeCode(getTreeCode(parent.getId()));
+            department.setTreeCode(generateTreeCode(parent.getId()));
             //查询父级完整区域
             String region = getRegionName(parent);
             department.setRegion(region);
@@ -554,7 +560,7 @@
             throw new ServiceException("处置单位已存在");
         }
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
-        department.setTreeCode(getTreeCode(parent.getId()));
+        department.setTreeCode(generateTreeCode(parent.getId()));
         department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
         department.setOrgType(DepartmentEnum.DISPOSAL_UNIT.getCode());
         //查询父级完整区域
@@ -601,7 +607,7 @@
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
 
         if (!department.getParentId().equals(sysDepartment.getParentId())) {
-            department.setTreeCode(getTreeCode(parent.getId()));
+            department.setTreeCode(generateTreeCode(parent.getId()));
             //查询父级完整区域
             String region = getRegionName(parent);
             department.setRegion(region);
@@ -680,7 +686,7 @@
             throw new ServiceException("监管单位已存在");
         }
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
-        department.setTreeCode(getTreeCode(parent.getId()));
+        department.setTreeCode(generateTreeCode(parent.getId()));
         department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.REGULATORY_UNIT.getCode()));
         department.setOrgType(DepartmentEnum.REGULATORY_UNIT.getCode());
         //查询父级完整区域
@@ -724,7 +730,7 @@
         SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
 
         if (!department.getParentId().equals(sysDepartment.getParentId())) {
-            department.setTreeCode(getTreeCode(parent.getId()));
+            department.setTreeCode(generateTreeCode(parent.getId()));
             //查询父级完整区域
             String region = getRegionName(parent);
             department.setRegion(region);

--
Gitblit v1.7.1