From 35b6c4c7a38900b3f0e258c0a1b0f6c9c95f5c6b Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 9 Dec 2022 09:59:56 +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

---
 .../ParamsCollectManifestHistoryEOServiceImpl.java   |  3 +++
 .../report/mapper/xml/ParamsReportDetailEOMapper.xml | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index c57b65ae3..418a7eb42 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -444,6 +444,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 			OnlCgformField onlCgformField = fieldList.get(i);
 			Map<String, Object> map = new HashMap<>();
 			String dbFieldName = onlCgformField.getDbFieldName();
+			if ("references_col".equals(dbFieldName)) {
+				continue;
+			}
 			if ("description".equals(dbFieldName)) {
 				indexOfDescription = i;
 				map.put("click2", true);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 642c29b42..967d482ac 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -169,12 +169,12 @@
 
     <select id="listInfoForChange" resultType="java.util.LinkedHashMap">
         select
-        prcd.*,
-        prc.old_params_config_id,
-        prd.nio_number
-        from params_report_detail prd
-        left join params_report_config_data prcd on prd.id = prcd.params_collect_manifest_id
-        left join params_report_config prc on prd.params_manifest_id = prc.params_manifest_id
+            prcd.*,
+            prc.old_params_config_id,
+            prd.nio_number
+        from params_report_config_data prcd
+        inner join  params_report_detail prd on prd.id = prcd.params_collect_manifest_id
+        inner join params_report_config prc on prcd.params_config_id = prc.id
         where prd.params_manifest_id = #{paramsReportId}
     </select>