From f0277ac7305caa3b7c8ea87e4e801925fa5498e7 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Sun, 26 Nov 2023 16:55:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=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

---
 .../service/impl/SarLawsTopicServiceImpl.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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 bd73fb58..d225211e 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
@@ -531,8 +531,10 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
                     field.setAccessible(true);
                     Object oldValue = field.get(oldLawsTopic);
                     Object newValue = field.get(newLawsTopic);
-                    if (oldValue instanceof Date && newValue instanceof Date) {
+                    if (oldValue instanceof Date){
                         oldValue = sdf.format((Date)oldValue);
+                    }
+                    if( newValue instanceof Date) {
                         newValue = sdf.format((Date)newValue);
                     }
                     if (!Objects.equals(oldValue, newValue)) {
@@ -564,20 +566,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) + "\"");
                             // 对比列表字段
-                        } else if ("meetingList".equals(field.getName())) {
+                        } 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);
-                            Method method = SarLawsTopic.class.getMethod("get" + fieldName + "List");
+                            Method method = SarLawsTopic.class.getMethod("get" + fieldName);
                             Object oldInvoke = method.invoke(oldLawsTopic);
                             Object newInvoke = method.invoke(newLawsTopic);
-                            if (oldInvoke == null && newInvoke == null) {
-                                continue;
+                            List<?> oldList = (List<?>) oldInvoke;
+                            List<?> newList = (List<?>) newInvoke;
+                            if (!isListEqual(oldList, newList)) {
+                                CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
+                                changes.add(annotationsByType.fieldName() + "被变更");
                             }
-                            List<SarLawsTopicMeeting> oldLawsTopicList = (List<SarLawsTopicMeeting>) oldInvoke;
-                            List<SarLawsTopicMeeting> newLawsTopicList = (List<SarLawsTopicMeeting>) newInvoke;
-                            isListEqual(oldLawsTopicList, newLawsTopicList);
-                        } else if ("topicContactInformationList".equals(field.getName()) || "insideContactInformationList".equals(field.getName())) {
-                            CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
-                            changes.add(annotationsByType.fieldName() + "被变更");
                         } else {
                             // 对比其他字段
                             CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];