From c5ef1790527313a1a4aab6ae46aa2712df12a507 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 7 Jun 2022 18:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E9=99=84=E4=BB=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 1876ca93d..290555de2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -327,12 +327,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); - List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplate()); String templateId = null; - String templateName= null; - if (CollectionUtil.isNotEmpty(ossFiles)) { - templateId = ossFiles.get(0).getId(); - templateName = ossFiles.get(0).getFileName(); + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplate())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplate()); + + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {