Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -343,8 +343,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 } else {
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
-                    newsNotice.setProjectName(project.getProjectName());
-//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setProjectName(project.getProjectName()+"-"+mould.getModelName());
+                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(Constant.MAIN_TAIN_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {
@@ -368,6 +368,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //添加通知消息
                 //查询到参与该项目的人
                 List<Integer> userIds = new ArrayList<>();
+                userIds.add(-1);
                 userIds.add(project.getCreatorId());
                 userIds.add(project.getManagerId());
                 List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("project_id", project.getId()));
@@ -388,7 +389,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 } else {
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
-                    newsNotice.setProjectName(project.getProjectName());
+                    newsNotice.setProjectName(project.getProjectName()+"-"+mould.getModelName());
                     newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(Constant.SCRAP_NOTICE);
                     newsNoticeMapper.insert(newsNotice);