Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -1085,8 +1085,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             msgIssue.setUserId(entity.getCreatedBy());
 
             //21.09.10:记录消息类型和对应的业务id
-            msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
-            msgDTO.setTargetId(entity.getId());
+            msgIssue.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+            msgIssue.setTargetId(entity.getId());
 
             msgList.add(msgIssue);
         }
@@ -1106,8 +1106,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 msg.setUserId(staff.getStaffId());
 
                 //21.09.10:记录消息类型和对应的业务id
-                msgDTO.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
-                msgDTO.setTargetId(issueProjectResultDTO.getProjectId());
+                msg.setMessageType(UserMessageTypeConstant.ISSUE_SHIFT_PROJECT);
+                msg.setTargetId(issueProjectResultDTO.getProjectId());
 
                 msgList.add(msg);
                 map.put(staff.getStaffId(),staff.getStaffId());