07 30 04 fix bugs

src/main/java/com/imed/costaccount/model/vo/CenterDepartmentVO.java

@@ -21,6 +21,8 @@ public class CenterDepartmentVO {
 
     private Boolean isParent;
 
+    private Integer isGatherCenter;
+
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<CenterDepartmentVO> child;
 }

src/main/java/com/imed/costaccount/service/impl/ResponsibilityDepartmentServiceImpl.java

@@ -41,6 +41,9 @@ public class ResponsibilityDepartmentServiceImpl
     public List<CenterDepartmentVO> getCenterDepart(User user) {
         List<CenterDepartmentVO> list = responsibilityService.getParentSon(user);
         for (CenterDepartmentVO centerDepartmentVO : list) {
+            if (centerDepartmentVO.getIsGatherCenter() == 2) {
+                centerDepartmentVO.setDepartments(new ArrayList<>());
+            }
             List<CenterDepartmentVO> child = centerDepartmentVO.getChild();
             if (CollUtil.isEmpty(child)) {
                 child = new ArrayList<>();

src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -161,7 +161,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         Integer id = dto.getId();
         this.removeById(id);
         List<Responsibility> child = this.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getParentId, id));
-        // 如果修改是否汇总中心 从是 -》 否那么子节点直接删除
+        // 如果修改是否汇总中心 从是 -> 否那么子节点直接删除
         if (responsibility.getIsGatherCenter() == 1 && dto.getIsGatherCenter() == 2) {
             this.removeByIds(child.stream().map(Responsibility::getId).collect(Collectors.toList()));
             return;
@@ -271,6 +271,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         for (Responsibility parent : parentList) {
             CenterDepartmentVO centerDepartmentVO = new CenterDepartmentVO();
             centerDepartmentVO.setResponsibilityId(parent.getId());
+            centerDepartmentVO.setIsGatherCenter(parent.getIsGatherCenter());
             centerDepartmentVO.setResponsibilityName(parent.getResponsibilityName());
             centerDepartmentVO.setIsParent(true);
             for (Responsibility son : sonList) {
@@ -279,6 +280,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
                     sonVO.setResponsibilityId(son.getId());
                     sonVO.setResponsibilityName(son.getResponsibilityName());
                     sonVO.setIsParent(false);
+                    sonVO.setIsGatherCenter(son.getIsGatherCenter());
                     List<CenterDepartmentVO> child = centerDepartmentVO.getChild();
                     if (CollUtil.isEmpty(child)) {
                         child = new ArrayList<>();