过滤已存在的责任中心

src/main/java/com/imed/costaccount/mapper/CostAccountShareMapper.java

@@ -1,7 +1,7 @@
 package com.imed.costaccount.mapper;
 
-import com.imed.costaccount.model.CostAccountShare;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.imed.costaccount.model.CostAccountShare;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -401,16 +401,18 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
                 .eq(CostShareLevel::getHospId, hospId).eq(CostShareLevel::getCalcType, calcType))
                 .stream().map(CostShareLevel::getId).distinct().collect(Collectors.toList());
         String accountingIds = costAccountShare.getAccountingIds();
-//        List<Long> responsibilityIdList=null;
-//        if (StrUtil.isNotBlank(accountingIds)){
-//            List<String> accountIdList = Arrays.asList(accountingIds.split(StrUtil.COMMA));
-//            responsibilityIdList= baseMapper.getResponsibilityIdsByAccountId(accountIdList);
-//        }
+        List<Long> responsibilityIdList=null;
+        if (StrUtil.isNotBlank(accountingIds)){
+            List<String> accountIdList = Arrays.asList(accountingIds.split(StrUtil.COMMA));
+            responsibilityIdList= baseMapper.getResponsibilityIdsByAccountId(accountIdList);
+        }
         // 筛选指定类型的责任中心 并且当前没有设置的责任中心
+        List<Long> finalResponsibilityIdList = responsibilityIdList;
         List<Responsibility> responsibilityList = responsibilityService.list(new QueryWrapper<Responsibility>().lambda()
                 .eq(Responsibility::getHospId, hospId)
                 .ne(Responsibility::getShareId,NumberConstant.ZERO))
-                .stream().filter(i -> costShareIds.contains(i.getShareId()) && !responsibilityId.equals(i.getId()) ).collect(Collectors.toList());
+                .stream().filter(i -> costShareIds.contains(i.getShareId()) && !responsibilityId.equals(i.getId())).collect(Collectors.toList());
+//        && (CollUtil.isNotEmpty(finalResponsibilityIdList) && !finalResponsibilityIdList.contains(i.getId()))
         return responsibilityList;
     }