From 18a41e1d889be7de507dc5b9135dd03f4ef0dbae Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 7 Apr 2023 13:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java    | 13 +++++++++----
 .../head/service/impl/HeadCustomEOServiceImpl.java  |  2 +-
 2 files changed, 10 insertions(+), 5 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 9ffc6c5d9..3c805bcd0 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
@@ -1481,9 +1481,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 map.put("click", true);
             }
 
-            if ("description".equals(dbFieldName) && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
+            if ("description".equals(dbFieldName)
+                    && ObjectUtils.isNotEmpty(paramsManifestEO)
+                    && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
                 indexOfDescription = i;
-            } else if ("references_col".equals(dbFieldName) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+            } else if ("references_col".equals(dbFieldName)
+                    && ObjectUtils.isNotEmpty(paramsManifestEO)
+                    && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                 indexOfDescription = i;
             }
 
@@ -1492,7 +1496,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             }
             if (CutEnum.CN.getValue().equals(cut)) {
                 if ("references_col".equals(dbFieldName)) {
-                    if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+                    if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                         map.put("type", true); // 标识
                         map.put("flag", true); // 标识
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
@@ -1509,7 +1513,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 }
             } else {
                 if ("references_col".equals(dbFieldName)) {
-                    if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+                    if (ObjectUtils.isNotEmpty(paramsManifestEO)
+                            && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
                         map.put("type", true); // 标识
                         map.put("flag", true); // 标识
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 8dd630c96..038a8549d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -314,7 +314,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
                     HeadCustomVO headCustomVO = new HeadCustomVO();
                     headCustomVO.setDb_field_name(paramsConfigEO.getId());
-                    headCustomVO.setDb_field_txt(String.valueOf(count++));
+                    headCustomVO.setDb_field_txt(paramsConfigEO.getConfigName());
                     headCustomVO.setIsLock(paramsConfigEO.getIsLock());
                     headCustomVO.setType("true");
                     headCustomVOList.add(headCustomVO);