From e171a13dd7fe4dbe485b02f440372b444b15c525 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sat, 12 Oct 2024 14:28:45 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E7=9F=AD=E4=BF=A1=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=9C=B0=E5=9D=80=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hz/pm/api/meeting/entity/dto/MeetingBasicDTO.java | 2 +- .../java/com/hz/pm/api/meeting/helper/MeetingNotifyHelper.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/MeetingBasicDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/MeetingBasicDTO.java index 401c0e5..1e8f34b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/MeetingBasicDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/MeetingBasicDTO.java @@ -53,7 +53,7 @@ public class MeetingBasicDTO { @ApiModelProperty("评审地点") private String meetingAddress; - @Length(max = 200, message = "评审详细地址超出限制") + @Length(min = 1, max = 200, message = "评审详细地址超出限制") @ApiModelProperty("评审详细地址") private String meetingAddressDetail; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingNotifyHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingNotifyHelper.java index 602d725..2a22fcc 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingNotifyHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingNotifyHelper.java @@ -132,7 +132,13 @@ public class MeetingNotifyHelper { String meetingTime = sTime + "至" + eTime; List notifies = new ArrayList<>(); List workingNotices = new ArrayList<>(); - String meetingAddress = meeting.getMeetingAddress() + " " + meeting.getMeetingAddressDetail(); + String meetingAddressDetail = meeting.getMeetingAddressDetail(); + String meetingAddress; + if (StrUtil.isNotBlank(meetingAddressDetail)) { + meetingAddress = meeting.getMeetingAddress() + " " + meetingAddressDetail; + } else { + meetingAddress = meeting.getMeetingAddress(); + } experts.forEach(w -> { String msgContent = String.format(MeetingMsgTemplateConst.CONFIRMED_ROSTER, w.getExpertName(), officialTime(w.getCreateOn()), meetingTime, meetingAddress,