From cac1a2f40ccc82bb2668f66c4fa83f7ce461f7ae Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 2 Feb 2023 10:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C-=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8F=82=E8=80=83=E5=88=97=E5=A4=9A=E8=A1=8C=E3=80=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=95=E7=94=A8=E5=8F=82=E8=80=83=E5=88=97?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 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 c6dec5747..1d517db7e 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
@@ -472,16 +472,31 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
 				Map<String, Object> referencesColMap = new HashMap<>();
+				Map<String,Object> referencesColConfigDataVOMap = new HashMap<>();
 				String referencesCol = collectManifestEO.getReferencesCol();
 				if (StringUtils.isNotBlank(referencesCol)) {
-					List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
+					String[] referencesColArr = referencesCol.split("</br>");
+					for (String col : referencesColArr) {
+						List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据
+						String key = UUID.randomUUID().toString().replaceAll("-","");
+						referencesColConfigDataVOMap.put(key,referencesColVOList);
+					}
+
+
 					referencesColMap.put("controlType", controlType);
-					referencesColMap.put("list", referencesColVOList);
+					referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
+
+					//referencesColMap.put("list", referencesColVOList);
 					manifestMap.put("referencesCol", referencesColMap);
 				} else {
 					List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
 					referencesColMap.put("controlType", controlType);
-					referencesColMap.put("list", referencesColVOList);
+
+					String key = UUID.randomUUID().toString().replaceAll("-","");
+					referencesColConfigDataVOMap.put(key,referencesColVOList);
+					referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
+
+					//referencesColMap.put("list", referencesColVOList);
 					manifestMap.put("referencesCol", referencesColMap);
 				}
 			}
@@ -5798,14 +5813,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}*/
 
 		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
+			StringBuilder referencesColBuilder = new StringBuilder();
+
 			// 参考列值设置为空标识
 			boolean referencesColIsNullFlag = true;
 			for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
 				if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) {
 					// 控件类型相同 才能引用
 					if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) {
-
-						StringBuilder referencesColBuilder = new StringBuilder();
+						// 如果拼接不为空  则是匹配到了多个  拼接换行符 </br>
+						if(StringUtils.isNotEmpty(referencesColBuilder.toString())){
+							referencesColBuilder.append("</br>");
+						}
 						if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
 							referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
 						} else {
@@ -5824,19 +5843,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 							referencesColBuilder.append(" ").append("#");
 						}
 
-						String referencesCol = referencesColBuilder.toString();
-						ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
 
-						updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
-						updateCollectManifestEO.setReferencesCol(referencesCol);
-						updateEOList.add(updateCollectManifestEO);
 
 						referencesColIsNullFlag = false;
-						break;
 					}
 				}
 			}
 
+			String referencesCol = referencesColBuilder.toString();
+			ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+
+			updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
+			updateCollectManifestEO.setReferencesCol(referencesCol);
+			updateEOList.add(updateCollectManifestEO);
+
 			if(referencesColIsNullFlag){
 				// 如果根据nio编号没有匹配到数据，将参考列的值设置为空
 				LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();