From 1fd9413da0443a32b20bd5da2adc16b2d246dfe2 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 30 Nov 2023 10:12:32 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/sarLawsTopic/entity/SarLawsTopic.java  |  2 +-
 .../service/impl/SarLawsTopicServiceImpl.java      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
index 35cd30c3..94b96605 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java
@@ -117,7 +117,7 @@ public class SarLawsTopic implements Serializable {
     /**
      * 课题组研究方案
      */
-    @CompareField(fieldName = "researchPlan")
+    @CompareField(fieldName = "课题研究方案")
     @ApiModelProperty(value = "课题研究方案")
     @TableField(value = "RESEARCH_PLAN")
     private String researchPlan;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
index 17d66f71..0dbf1bc2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
@@ -557,7 +557,17 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
                            }
                             // 获取字段名称
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "由\"" + String.join(",",oldFileNameList) + "\"改为\"" + String.join(",",fileNameList) + "\"");
+                            if (StringUtils.isBlank(String.join(",",oldFileNameList))) {
+                                oldValue = "空";
+                            }else {
+                                oldValue = String.join(",",oldFileNameList);
+                            }
+                            if (StringUtils.isBlank(String.join(",",fileNameList))) {
+                                newValue = "空";
+                            }else {
+                                newValue = String.join(",",fileNameList);
+                            }
+                            changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
                             // 对比列表字段
                         } else if ("meetingList".equals(field.getName())|| "topicContactInformationList".equals(field.getName()) || "insideContactInformationList".equals(field.getName())) {
                             String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
@@ -573,7 +583,7 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
                         } else {
                             // 对比其他字段
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
+                            changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldValue).orElse("空") + "\"改为\"" + Optional.ofNullable(newValue).orElse("空") + "\"");
                         }
                     }
                 } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {