From 4fd6cf4029a478118a75f9ee8802d90de3cf31b3 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 30 Nov 2023 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?bug:=2078302=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=EF=BC=8C=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E5=A4=84?= =?UTF-8?q?=E7=90=86null=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/MeetingTopic.java | 12 +++++++++++ .../impl/InsideOutsideMeetingServiceImpl.java | 13 ++++++++++-- .../entity/SarLawsContactInformation.java | 13 ++++++++++++ .../entity/SarLawsTopicMeeting.java | 12 +++++++++++ .../service/impl/SarLawsTopicServiceImpl.java | 20 +++++++++++++++++++ 5 files changed, 68 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java index 24e0f273..4b13c46a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java +++ b/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; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index 63b64bb0..8f622e8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/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 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) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsContactInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsContactInformation.java index c5c7db0a..cbafc458 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsContactInformation.java +++ b/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; + } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java index fcb1ff22..95f2df21 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java +++ b/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; + } } \ No newline at end of file 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 0dbf1bc2..86d81f7c 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 @@ -648,6 +648,26 @@ public class SarLawsTopicServiceImpl extends ServiceImpl 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) {