Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project

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;
 	/**
 	 * 手机

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<ResiTopicDao, ResiTopi
         wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId());
         wrapper.orderByAsc(TopicConstant.SORT);
         List<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
-        if (attachments.size()==NumConstant.ZERO){
-            return new TopicInfoDTO();
-        }
-        List<String> attachmentUrls = new ArrayList<>();
-        for(ResiTopicAttachmentEntity attachment : attachments){
-            attachmentUrls.add(attachment.getAttachmentUrl());
+        if (attachments.size() != NumConstant.ZERO){
+            List<String> 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());