From 333a2d1a98ebc2232b6e6c75e869a716f2f55ffa Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 8 Dec 2022 10:55:33 +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-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 30 +++++++++++--------
 .../controller/ParamsInfoEOController.java    |  2 +-
 2 files changed, 19 insertions(+), 13 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 fbc752a16..655936c7b 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
@@ -436,18 +436,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			String controlType = collectManifestEO.getControlType();
 			String paramsCollectManifestId = collectManifestEO.getId();
 
-			Map<String, Object> referencesColMap = new HashMap<>();
-			String referencesCol = collectManifestEO.getReferencesCol();
-			if (StringUtils.isNotBlank(referencesCol)) {
-				List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
-				referencesColMap.put("controlType", controlType);
-				referencesColMap.put("list", referencesColVOList);
-				manifestMap.put("referencesCol", referencesColMap);
-			} else {
-				List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
-				referencesColMap.put("controlType", controlType);
-				referencesColMap.put("list", referencesColVOList);
-				manifestMap.put("referencesCol", referencesColMap);
+			if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
+				Map<String, Object> referencesColMap = new HashMap<>();
+				String referencesCol = collectManifestEO.getReferencesCol();
+				if (StringUtils.isNotBlank(referencesCol)) {
+					List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
+					referencesColMap.put("controlType", controlType);
+					referencesColMap.put("list", referencesColVOList);
+					manifestMap.put("referencesCol", referencesColMap);
+				} else {
+					List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
+					referencesColMap.put("controlType", controlType);
+					referencesColMap.put("list", referencesColVOList);
+					manifestMap.put("referencesCol", referencesColMap);
+				}
 			}
 
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
@@ -1118,6 +1120,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						String[] references = projectName.split("-");
 						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
 
+					} else {
+						continue;
 					}
 				} else {
 					map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1131,6 +1135,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						String[] references = projectName.split("-");
 						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
 
+					} else {
+						continue;
 					}
 				} else {
 					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index 1443702ba..a90866929 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -67,7 +67,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 								   @RequestParam(name="orderByField", required = false) String orderByField,
 								   @RequestParam(name="orderBy", required = false) String orderBy,
 								   @RequestParam(name="cut") String cut,
-								   @RequestParam(name="allNumber") String allNumber,
+								   @RequestParam(name="allNumber", required = false) String allNumber,
 								   HttpServletRequest req) {
 
 		if (StringUtils.isNotEmpty(allNumber)) {