From c2034971af36ac01756fcbbb86c47c72264081bc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 11 Jan 2023 11:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9e36f1ab1..cb6d235fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -499,9 +499,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); List paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 - for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { - List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 - paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + if(CollectionUtils.isNotEmpty(paramsConfigDatas)){ + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) { + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList); + } } configMap.put("controlType", controlType); configMap.put("paramsConfigData", paramsConfigDataVO);