Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ImageClassificationFileServiceImpl.java

@@ -84,10 +84,10 @@ public class ImageClassificationFileServiceImpl extends BaseServiceImpl<ImageCla
             //查询下级节点信息
             WbsTreeContract node = wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(Long.valueOf(imageClassificationFile.getWbsIdsStr()));
             List<WbsTreeContract> wbsTreeContracts;
-            if (node.getParentId() == 0) {
-                wbsTreeContracts = wbsTreeContractClient.queryAllChild(imageClassificationFile.getContractId());
+            if (node.getPId() == 0) {
+                wbsTreeContracts = wbsTreeContractClient.queryAllChild(Long.parseLong(node.getContractId()));
             } else {
-                wbsTreeContracts = wbsTreeContractClient.queryCurrentNodeAllChild(imageClassificationFile.getContractId(), node.getId());
+                wbsTreeContracts = wbsTreeContractClient.queryCurrentNodeAllChild(Long.parseLong(node.getContractId()), node.getPKeyId());
             }
             wbsTreeContracts.add(node);
             imageClassificationFile.setWbsIds(wbsTreeContracts.stream().map(wtc -> wtc.getPKeyId() + "").collect(Collectors.toList()));

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

@@ -241,7 +241,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
     @Override
     public List<WbsTreeContract> queryCurrentNodeAllChild(Long contractId, Long parentId) {
-        return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, contractId).like(WbsTreeContract::getAncestors, parentId).eq(WbsTreeContract::getIsDeleted, 0));
+        return this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, contractId).like(WbsTreeContract::getAncestorsPId, parentId).eq(WbsTreeContract::getIsDeleted, 0));
     }
 
     @Override

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

@@ -910,7 +910,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             ContractInfo contractInfo1 = baseMapper.selectById(contractInfo.getId());
             //如果模版引用发生改变，需要判断合同段中是否有节点
             if(contractInfo1.getTemplateType()!=null&&contractInfo.getTemplateType()!=null&&contractInfo1.getTemplateType()!=contractInfo.getTemplateType()){
-                String sql="Selcet  COUNT(*) From m_wbs_tree_contract Where contract_id="+contractInfo.getId()+" and is_deleted=0";
+                String sql="select  COUNT(*) From m_wbs_tree_contract Where contract_id="+contractInfo.getId()+" and is_deleted=0";
                 Integer size = jdbcTemplate.queryForObject(sql, Integer.class);
                 if(size>0){
                     throw new ServiceException("合同段中已存在节点，无法更改");