关闭议题、议题转项目居民端话题人议题人相同发送一条消息

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -415,11 +415,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE);
         msgDTO.setMessageContent(messageContent);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
-        UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class);
         msgDTO.setUserId(topicDTO.getCreatedBy());
         msgList.add(msgDTO);
-        msgIssue.setUserId(entity.getCreatedBy());
+        //话题人和议题人是同一个人时则只发送一条居民消息
-        msgList.add(msgIssue);
+        if (!topicDTO.getCreatedBy().equals(entity.getCreatedBy())) {
+            UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class);
+            msgIssue.setUserId(entity.getCreatedBy());
+            msgList.add(msgIssue);
+        }
         return messageFeignClient.saveUserMessageList(msgList);
     }
 
@@ -541,11 +544,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         String topicIssueMessage = String.format(UserMessageConstant.ISSUE_SHIFT_PROJECT_MSG, formDTO.getTopicDTO().getTopicContent(), issueProjectResultDTO.getOrgName());
         msgDTO.setMessageContent(topicIssueMessage);
         msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
-        UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class);
         msgDTO.setUserId(formDTO.getTopicDTO().getCreatedBy());
         msgList.add(msgDTO);
-        msgIssue.setUserId(entity.getCreatedBy());
+        //话题人和议题人是同一个人时则只发送一条居民消息
-        msgList.add(msgIssue);
+        if (!formDTO.getTopicDTO().getCreatedBy().equals(entity.getCreatedBy())) {
+            UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO, UserMessageFormDTO.class);
+            msgIssue.setUserId(entity.getCreatedBy());
+            msgList.add(msgIssue);
+        }
         //2:创建项目工作人员消息对象
         String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESLOVED_MSG, entity.getIssueTitle());
         //所选人员如果即在部门下又在网格下则只发一条消息