代码冲突

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

@@ -495,6 +495,11 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         return wbsTreeContractService.getEKey(contractId,pKeyId,wbsId);
     }
 
+    @Override
+    public Integer findIsExistTreeNode(List<String> processNodeList) {
+        return 0;
+    }
+
 
     @Override
     public List<WbsTreeContract> queryListByPIds(List<Long> pIds) {
@@ -502,10 +507,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     }
 
 
-    @Override
-    public Integer findIsExistTreeNode(List<String> ids) {
-        return wbsTreeContractService.findIsExistTreeNode(ids);
-    }
+
 
     @Override
     public void saveNameRuleByPkeyId(Long pKeyId, String s, Long projectId) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -109,4 +109,6 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
     R<List<WbsTreeContract>> getSiblingWbsContract(Long pKeyId);
 
     R moveNode(MoveNodeDTO dto);
+
+    List<WbsTreeContract> queryListByPIds(List<Long> pIds);
 }

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

@@ -3248,10 +3248,7 @@ 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) {