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 b9dd5fc5a..8f14f2d67 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 @@ -4419,7 +4419,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); StringBuilder referencesColBuilder = new StringBuilder(); if (!" ".equals(referencesColList.get(0))) { @@ -5893,19 +5893,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map : configDataList) { String paramsCollectManifestId = (String) map.get("id"); + StringBuilder referncesColBuilder = new StringBuilder(); + // 添加配置数据 for (Map.Entry entry : map.entrySet()) { - StringBuilder referncesColBuilder = new StringBuilder(); + if ("id".equals(entry.getKey())) { continue; } // 取值 - Map paramsConfigDataMap = (Map) entry.getValue(); - String controlType = (String) paramsConfigDataMap.get("controlType"); +// Map paramsConfigDataMap = (Map) entry.getValue(); +// String controlType = (String) paramsConfigDataMap.get("controlType"); // 无法转ParamsConfigDataVO(遍历会出现该异常 : LinkedHashMap cannot be cast to ParamsConfigDataVO) - List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + List> paramsConfigDataVOList = (List>) entry.getValue(); if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { + + // 如果拼接不为空 则是匹配到了多个 拼接换行符
+ if(StringUtils.isNotEmpty(referncesColBuilder.toString())){ + referncesColBuilder.append("
"); + } + // TEXT List> textList = paramsConfigDataVOList.stream() .filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList()); @@ -5980,16 +5988,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl