Przeglądaj źródła

07 30 05 fix bugs

hr 4 lat temu
rodzic
commit
59fe77cf5a

+ 0 - 1
src/main/java/com/imed/costaccount/model/vo/CenterDepartmentVO.java

@@ -16,7 +16,6 @@ public class CenterDepartmentVO {
 
     private String responsibilityName;
 
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<DepartVO> departments;
 
     private Boolean isParent;

+ 10 - 0
src/main/java/com/imed/costaccount/service/impl/ResponsibilityDepartmentServiceImpl.java

@@ -3,7 +3,9 @@ package com.imed.costaccount.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.mapper.ResponsibilityDepartmentMapper;
+import com.imed.costaccount.model.Responsibility;
 import com.imed.costaccount.model.ResponsibilityDepartment;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartDTO;
@@ -18,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -79,6 +82,13 @@ public class ResponsibilityDepartmentServiceImpl
         if (CollUtil.isEmpty(departmentIds)) {
             return ;
         }
+        Responsibility byId = responsibilityService.getById(responsibilityId);
+        if (Objects.isNull(byId)) {
+            throw new CostException(500, "责任中心不存在或已被移除");
+        }
+        if (byId.getIsGatherCenter() == 1) {
+            throw new CostException(500, "汇总中心不允许添加对照关系,请先修改");
+        }
         List<ResponsibilityDepartment> data = departmentIds.stream().map(item -> {
             ResponsibilityDepartment centerDepart = new ResponsibilityDepartment();
             return centerDepart.setResponsibilityId(responsibilityId).setCreateTime(System.currentTimeMillis()).setHospId(hospId)