diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 3a50cce..d86c507 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -391,11 +391,15 @@ public class ContractServiceImpl implements ContractService { } // 查询合同动态字段及条款 - TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId()); - // 设置合同动态字段 - respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS()); - // 设置合同动态条款 - respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS()); + if (contractMainDO.getBusinessId() != null) { + TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId()); + if (tmplInscBsnRel != null) { + // 设置合同动态字段 + respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS()); + // 设置合同动态条款 + respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS()); + } + } return respVO; } @@ -478,11 +482,15 @@ public class ContractServiceImpl implements ContractService { } // 查询合同动态字段及条款 - TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId()); - // 设置合同动态字段 - respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS()); - // 设置合同动态条款 - respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS()); + if (contractMainDO.getBusinessId() != null) { + TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId()); + if (tmplInscBsnRel != null) { + // 设置合同动态字段 + respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS()); + // 设置合同动态条款 + respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS()); + } + } return respVO; }