src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -106,9 +106,7 @@ public interface ProjectMapper {
             + "AND is_delete = 0")
     ProjectModuleDO getProjectWorkById(Long id);
 
-    @Select("select principal_id from organize_oa.oa_project_child where project_id=#{id} union "
-            + "select principal_id from organize_oa.oa_project_modules where project_child_id in"
-            + "(select id from organize_oa.oa_project_child where project_id = #{id})")
+    @Select("select principal_id from organize_oa.oa_project_child where project_id=#{id}")
     List <Long> getMemberByProjectId(Integer id);
 
     @Select("select principal_id from organize_oa.oa_project_modules where project_child_id=#{id}")

src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java

@@ -157,7 +157,6 @@ public class MessageServiceImpl implements MessageService {
         String systemName = projectMapper.getWorkById(systemId).getName();
         // 添加消息
         MessageAddVO messageAddVO = new MessageAddVO();
-        messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
         messageAddVO.setUid(uid);
         messageAddVO.setTitle("审批消息");
         String moddleName = projectMapper.getModuleById(moddleId).getName();
@@ -194,21 +193,16 @@ public class MessageServiceImpl implements MessageService {
         for (Long uid : uidList) {
             MessageAddVO messageAddVO = new MessageAddVO();
             messageAddVO.setUid(uid);
-            messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
             messageAddVO.setTitle("项目变动消息");
             if (type == 3) {
                 messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人");
-                messageAddVO.setType("Project_child");
-                messageAddVO.setToId(systemId.longValue());
             } else if (type == 2) {
                 messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态");
-                messageAddVO.setType("Project");
-                messageAddVO.setToId(pId.longValue());
             } else if (type == 1) {
                 messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目");
-                messageAddVO.setType("Project");
-                messageAddVO.setToId(pId.longValue());
             }
+            messageAddVO.setType("Project");
+            messageAddVO.setToId(pId.longValue());
             messageMapper.messageAdd(messageAddVO);
         }
     }
@@ -239,7 +233,6 @@ public class MessageServiceImpl implements MessageService {
         if (type == 1) {
             MessageAddVO messageAddVO = new MessageAddVO();
             messageAddVO.setUid(projectMapper.getPid(moddleId));
-            messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
             messageAddVO.setTitle("子系统变动消息");
             messageAddVO.setText("项目经理" + senderName + "删除了" + projectName + "项目的"
                     + systemName + "系统的" + moddleName + "模块");
@@ -249,7 +242,6 @@ public class MessageServiceImpl implements MessageService {
             for (Long uid : uidList) {
                 MessageAddVO messageAddVO = new MessageAddVO();
                 messageAddVO.setUid(uid);
-                messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
                 messageAddVO.setTitle("子系统变动消息");
                 if (type == 2) {
                     messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
@@ -288,7 +280,7 @@ public class MessageServiceImpl implements MessageService {
         messageAddVO.setTitle("日报消息");
         messageAddVO.setText(projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人" + principalName
                 + "刚刚填写了日报");
-        messageAddVO.setType("Project_daily");
+        messageAddVO.setType("跳转日报页");
         messageMapper.messageAdd(messageAddVO);
     }