From 33bea2cad04213ac59bf0b00dd428e77329b4acf Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 12 Nov 2025 11:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8A=A8=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=81=E8=A1=A8=E5=8D=95=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) 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; }