解决代码冲突

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

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX;
 
 @FeignClient(value = APPLICATION_NAME_PREFIX + "manager")

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

@@ -209,7 +209,4 @@ public interface WbsTreeContractClient {
 
     @PostMapping(API_PREFIX + "/queryListByPIds")
     List<WbsTreeContract> queryListByPIds(@RequestBody List<Long> pIds);
-
-    @GetMapping(API_PREFIX + "/getNameRuleByRule")
-    R getNameRuleByRule(@RequestParam String nameRule, @RequestParam String wbsId);
 }

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

@@ -8,6 +8,8 @@ import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.service.IWbsParamService;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class WbsParamClientImpl implements WbsParamClient{

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

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.business.dto.EKeyDto;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.controller.WbsTreeContractController;
@@ -501,11 +502,6 @@ 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) {
         wbsTreeContractController.saveContractNameRule(s,pKeyId,projectId);

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

@@ -3250,17 +3250,6 @@ 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));
-    }
 
     /**
      * 展开所有合并单元格并将值填充到每个单元格