07 28 01 fix bug

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

@@ -68,7 +68,7 @@ public class ResponsibilityDepartmentServiceImpl
                         .eq(ResponsibilityDepartment::getHospId, hospId)
         );
         if (CollUtil.isNotEmpty(list)) {
-            this.removeByIds(list);
+            this.removeByIds(list.stream().map(ResponsibilityDepartment::getId).collect(Collectors.toList()));
         }
         List<Integer> departmentIds = departDTO.getDepartmentIds();
         if (CollUtil.isEmpty(departmentIds)) {

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

@@ -54,7 +54,12 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
 
         parentCostResponsibility.forEach(i -> costResponsibilityVOS.forEach(j -> {
             if (j.getParentId().equals(i.getId())) {
-                i.getChild().add(j);
+                List<CostResponsibilityVO> child = i.getChild();
+                if (CollUtil.isEmpty(child)) {
+                    child = new ArrayList<>();
+                }
+                child.add(j);
+                i.setChild(child);
             }
         }));
 
@@ -87,7 +92,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         }
 
         Responsibility center = BeanUtil.convertObj(responsibilitySaveDTO, Responsibility.class);
-        center.setCreateTime(new Date().getTime()).setId(null).setParentId(id).setHospId(user.getHospId());
+        center.setCreateTime(new Date().getTime()).setId(null).setParentId(id).setHospId(user.getHospId()).setResponsibilityLevel(2);
         if (id == 0) {
             center.setResponsibilityLevel(1);
             center.setShareLevel(0);
@@ -133,7 +138,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.removeById(id);
         // 新增父节点数据
         Responsibility newResponsibility = BeanUtil.convertObj(dto, Responsibility.class);
-        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime());
+        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime()).setResponsibilityLevel(1);
         this.save(newResponsibility);
         // 将原来所有父节点下数据关联到新的父节点下
         List<Responsibility> list = this.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getParentId, id));
@@ -155,7 +160,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.removeById(id);
         // 新增父节点数据
         Responsibility newResponsibility = BeanUtil.convertObj(dto, Responsibility.class);
-        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime());
+        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime()).setResponsibilityLevel(1);
         this.save(newResponsibility);
     }
 
@@ -224,7 +229,12 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
                 if (parent.getId().equals(son.getParentId())) {
                     sonVO.setResponsibilityId(son.getId());
                     sonVO.setResponsibilityName(son.getResponsibilityName());
-                    centerDepartmentVO.getChild().add(sonVO);
+                    List<CenterDepartmentVO> child = centerDepartmentVO.getChild();
+                    if (CollUtil.isEmpty(child)) {
+                        child = new ArrayList<>();
+                    }
+                    child.add(sonVO);
+                    centerDepartmentVO.setChild(child);
                 }
             }
             list.add(centerDepartmentVO);
@@ -237,6 +247,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     public List<CommonVO> getParentList(User user) {
         List<Responsibility> list = this.list(
                 new LambdaQueryWrapper<Responsibility>().select(Responsibility::getId, Responsibility::getResponsibilityName)
+                        .eq(Responsibility::getResponsibilityLevel,1)
                         .eq(Responsibility::getHospId, user.getHospId())
         );
         return list.stream().map(i -> {

src/main/resources/mapper/ResponsibilityDepartmentMapper.xml

@@ -5,12 +5,12 @@
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.imed.costaccount.model.ResponsibilityDepartment" id="responsibilityDepartmentMap">
-        <result property="id" column="id"/>
-        <result property="responsibilityId" column="responsibility_id"/>
-        <result property="departmentId" column="department_id"/>
-        <result property="hospId" column="hosp_id"/>
-        <result property="createTime" column="create_time"/>
-        <result property="deleteTime" column="delete_time"/>
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="responsibilityId" column="responsibility_id" jdbcType="INTEGER"/>
+        <result property="departmentId" column="department_id" jdbcType="INTEGER"/>
+        <result property="hospId" column="hosp_id" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="BIGINT"/>
+        <result property="deleteTime" column="delete_time" jdbcType="BIGINT"/>
     </resultMap>