合并代码

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -494,6 +494,18 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         return wbsTreeContractService.getEKey(contractId,pKeyId,wbsId);
     }
 
+
+    @Override
+    public List<WbsTreeContract> queryListByPIds(List<Long> pIds) {
+        return wbsTreeContractService.queryListByPIds(pIds);
+    }
+
+
+    @Override
+    public Integer findIsExistTreeNode(List<String> ids) {
+        return wbsTreeContractService.findIsExistTreeNode(ids);
+    }
+
     @Override
     public void saveNameRuleByPkeyId(Long pKeyId, String s, Long projectId) {
         wbsTreeContractController.saveContractNameRule(s,pKeyId,projectId);
@@ -502,8 +514,4 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
 
 
-    @Override
-    public List<WbsTreeContract> queryListByPIds(List<Long> pIds) {
-        return wbsTreeContractService.queryListByPIds(pIds);
-    }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -175,4 +175,7 @@ public interface WbsTreeContractMapper extends EasyBaseMapper<WbsTreeContract> {
                                                                           @Param("ids") Set<Long> ids);
 
     void updatePartitionCodeByPKyId(@Param("wbsTreeContract") WbsTreeContract wbsTreeContract);
+
+    Integer findIsExistTreeNode(List<String> ids);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -3235,6 +3235,18 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         return true;
     }
 
+    @Override
+    public Integer findIsExistTreeNode(List<String> ids) {
+        return baseMapper.findIsExistTreeNode(ids);
+    }
+
+    @Override
+    public List<WbsTreeContract> queryListByPIds(List<Long> pIds) {
+        return baseMapper.selectList(Wrappers.<WbsTreeContract>lambdaQuery()
+                .in(WbsTreeContract::getPId, pIds)
+                .eq(WbsTreeContract::getIsDeleted, 0));
+    }
+
     /**
      * 展开所有合并单元格并将值填充到每个单元格
      *