bug: 78302内外部会议，政策法规资料修改记录处理null值

adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -69,4 +70,15 @@ public class MeetingTopic extends BaseEntity {
     @ApiModelProperty(value = "修改时间")
     @TableField("MODIFY_TIME")
     private Date modifyTime;
+
+    public static MeetingTopic emptyValueProcess(MeetingTopic meetingTopic) {
+        if (StringUtils.isBlank(meetingTopic.getAgendaName()) &&
+                StringUtils.isBlank(meetingTopic.getAgendaMaterials()) &&
+                StringUtils.isBlank(meetingTopic.getReporter()) &&
+                StringUtils.isBlank(meetingTopic.getReportingUnit()) &&
+                StringUtils.isBlank(meetingTopic.getAgendaContent())) {
+            return null;
+        }
+        return meetingTopic;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java

@@ -12,8 +12,6 @@ import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO;
 import com.adc.da.slrs.InsideOntSideMeeting.entity.MeetingTopic;
 import com.adc.da.slrs.InsideOntSideMeeting.service.InsideOutsideMeetingService;
 import com.adc.da.slrs.InsideOntSideMeeting.service.MeetingTopicService;
-import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation;
-import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic;
 import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.tsDictionaryType.entity.TsDicType;
@@ -677,6 +675,17 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
             return true;
         if (l0 == null || l1 == null)
             return false;
+        if (l1.size() > 0) {
+            Iterator iterator = l1.iterator();
+            while(iterator.hasNext()) {
+                Object iterato = iterator.next();
+                MeetingTopic meetingTopic = (MeetingTopic) iterato;
+                MeetingTopic meetingTopic1 = MeetingTopic.emptyValueProcess(meetingTopic);
+                if (meetingTopic1 == null) {
+                    iterator.remove();
+                }
+            }
+        }
         if (l0.size() != l1.size())
             return false;
         for (Object o : l0) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsContactInformation.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 政策课题组联系方式
@@ -70,4 +71,16 @@ public class SarLawsContactInformation implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    public static SarLawsContactInformation emptyValueProcess(SarLawsContactInformation sarLawsContactInformation) {
+        if (StringUtils.isBlank(sarLawsContactInformation.getName()) &&
+                StringUtils.isBlank(sarLawsContactInformation.getGroupType()) &&
+                StringUtils.isBlank(sarLawsContactInformation.getDepartment()) &&
+                StringUtils.isBlank(sarLawsContactInformation.getEmail()) &&
+                StringUtils.isBlank(sarLawsContactInformation.getPhone()) &&
+                StringUtils.isBlank(sarLawsContactInformation.getIdentity())) {
+            return null;
+        }
+        return sarLawsContactInformation;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 政策课题组会议
@@ -71,4 +72,15 @@ public class SarLawsTopicMeeting implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    public static SarLawsTopicMeeting emptyValueProcess(SarLawsTopicMeeting sarLawsTopicMeeting) {
+        if (StringUtils.isBlank(sarLawsTopicMeeting.getMeetingName()) &&
+                StringUtils.isBlank(sarLawsTopicMeeting.getMeetingTime()) &&
+                StringUtils.isBlank(sarLawsTopicMeeting.getMeetingAddress()) &&
+                StringUtils.isBlank(sarLawsTopicMeeting.getParticipants()) &&
+                StringUtils.isBlank(sarLawsTopicMeeting.getMeetingContent())) {
+            return null;
+        }
+        return sarLawsTopicMeeting;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java

@@ -648,6 +648,26 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
             return true;
         if (l0 == null || l1 == null)
             return false;
+        if (l1.size() > 0) {
+            Iterator iterator = l1.iterator();
+            while(iterator.hasNext()) {
+                Object iterato = iterator.next();
+                if (iterato instanceof SarLawsTopicMeeting) {
+                    SarLawsTopicMeeting oldMeeting = (SarLawsTopicMeeting) iterato;
+                    SarLawsTopicMeeting meeting = SarLawsTopicMeeting.emptyValueProcess(oldMeeting);
+                    if (meeting == null) {
+                        iterator.remove();
+                    }
+                }
+                if (iterato instanceof SarLawsContactInformation) {
+                    SarLawsContactInformation oldContactInformation = (SarLawsContactInformation) iterato;
+                    SarLawsContactInformation information = SarLawsContactInformation.emptyValueProcess(oldContactInformation);
+                    if (information == null) {
+                        iterator.remove();
+                    }
+                }
+            }
+        }
         if (l0.size() != l1.size())
             return false;
         for (Object o : l0) {