From 48fb6ae4146a3f246274b5c996166486489cb02a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 May 2020 09:30:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=99=90=E5=88=B615=E4=B8=AA=E5=AD=97=E4=BB=A5=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index 7356f97392..8d1a78bdfe 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -35,7 +35,7 @@ public class StaffSubmitFromDTO implements Serializable { * 姓名 */ @NotBlank(message = "姓名不能为空") - @Length(max = 5, message = "姓名不能超过5个字符") + @Length(max = 15, message = "姓名不能超过15个字符") private String name; /** * 手机 From 390ccd9628b0cc5fc43197e608362bacd377a0d1 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 22 May 2020 10:25:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/ResiTopicServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 60c3144faf..807c0d6a95 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -929,14 +929,13 @@ public class ResiTopicServiceImpl extends BaseServiceImpl attachments = resiTopicAttachmentDao.selectList(wrapper); - if (attachments.size()==NumConstant.ZERO){ - return new TopicInfoDTO(); - } - List attachmentUrls = new ArrayList<>(); - for(ResiTopicAttachmentEntity attachment : attachments){ - attachmentUrls.add(attachment.getAttachmentUrl()); + if (attachments.size() != NumConstant.ZERO){ + List attachmentUrls = new ArrayList<>(); + for(ResiTopicAttachmentEntity attachment : attachments){ + attachmentUrls.add(attachment.getAttachmentUrl()); + } + topicInfo.setTopicImgs(attachmentUrls); } - topicInfo.setTopicImgs(attachmentUrls); //话题发起人 IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO(); issueInitiator.setUserId(topicInfo.getPublishedUser()); From d702c4ba5b9069dbef6dd382ddf8b1b6a32d7f4b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 May 2020 11:05:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index 8d1a78bdfe..284880f6d5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -35,7 +35,7 @@ public class StaffSubmitFromDTO implements Serializable { * 姓名 */ @NotBlank(message = "姓名不能为空") - @Length(max = 15, message = "姓名不能超过15个字符") + @Length(max = 15, message = "姓名仅允许输入15个字符") private String name; /** * 手机