liuyc 2 rokov pred
rodič
commit
16dd631152

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -149,7 +149,7 @@ public class WbsTreeContractController extends BladeController {
     /**
      * 客户端懒加载获取合同段树(统计颜色、填报数量)
      *
-     * @author liuYC
+     * @author liuyc
      * @date 2023年7月17日10:28:49
      */
     @GetMapping("/lazyQueryContractWbsTree")

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

@@ -434,6 +434,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                 } else if (contractInfo.getContractType().equals(2) || contractInfo.getContractType().equals(3)) {
                     //TODO 监理、指挥部
                     List<ContractRelationJlyz> relationJLYZList = jdbcTemplate.query("select * from m_contract_relation_jlyz where contract_id_jlyz = " + contractId, new BeanPropertyRowMapper<>(ContractRelationJlyz.class));
+                    if (ObjectUtil.isEmpty(relationJLYZList) || relationJLYZList.size() <= 0) {
+                        return null;
+                    }
                     for (ContractRelationJlyz contractRelationJlyz : relationJLYZList) {
                         LambdaQueryWrapper<WbsTreeContract> queryWrapper = new LambdaQueryWrapper<>();
                         queryWrapper.select(WbsTreeContract::getParentId, WbsTreeContract::getId, WbsTreeContract::getPKeyId);

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

@@ -687,6 +687,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         //根节点时默认加载所有施工合同段的树
                         contractIds = this.contractClient.getProcessContractByJLContractId(contractId);
                     }
+                    if (ObjectUtil.isEmpty(contractIds) || contractIds.size() <= 0) {
+                        return null;
+                    }
                     for (String sgContractId : contractIds) {
                         ContractInfo sgContractInfo = jdbcTemplate.query("select contract_name from m_contract_info where id = " + sgContractId, new BeanPropertyRowMapper<>(ContractInfo.class)).stream().findAny().orElse(null);
                         if (sgContractInfo != null) {