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/controller/InvitationRecordController.java

@@ -29,7 +29,7 @@ public class InvitationRecordController {
     InvitationRecordService invitationRecordService;
     /**
      * 添加邀请记录并产生链接
-     * token 用户凭证，projectId 项目id ,inviteeId 被邀请人id
+     * token 用户凭证，projectId 项目id ,inviteeId 被邀请人id,operatorId 操作人id
      * 参数：
      * @return
      */

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

@@ -56,12 +56,9 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
         vo.setCompanyName(project.getOwnerCompanyName());
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         User invitee = userMapper.selectById(invitationRecord.getInviteeId());
-        if(null == user){
-            msg.setError("当前角色涉及权限问题，请重新登录");
-            return msg;
-        }else{
+        if(null == token){
             InvitationRecord record = invitationRecordMapper.selectOne(new QueryWrapper<InvitationRecord>()
-                    .eq("operator_id", user.getId())
+                    .eq("operator_id", invitationRecord.getOperatorId())
                     .eq("project_id", invitationRecord.getProjectId())
                     .eq("invitee_id", invitationRecord.getInviteeId()));
             if(null == record){
@@ -76,6 +73,28 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
                 BeanUtils.copyProperties(record,vo);
                 msg.data = vo;
             }
+        }else{
+            if(null == user){
+                msg.setError("当前角色涉及权限问题，请重新登录");
+                return msg;
+            }else{
+                InvitationRecord record = invitationRecordMapper.selectOne(new QueryWrapper<InvitationRecord>()
+                        .eq("operator_id", user.getId())
+                        .eq("project_id", invitationRecord.getProjectId())
+                        .eq("invitee_id", invitationRecord.getInviteeId()));
+                if(null == record){
+                    invitationRecord.setOperator(user.getUsername());
+                    invitationRecord.setOperatorId(user.getId());
+                    invitationRecord.setInvitee(invitee.getUsername());
+                    invitationRecord.setAddressUrl(invitationUrl+invitationRecord.getInviteeId()+"/"+invitationRecord.getProjectId()+"/"+user.getId());
+                    invitationRecordMapper.insert(invitationRecord);
+                    BeanUtils.copyProperties(invitationRecord,vo);
+                    msg.data = vo;
+                }else{
+                    BeanUtils.copyProperties(record,vo);
+                    msg.data = vo;
+                }
+            }
         }
         return msg;
     }

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

@@ -262,7 +262,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName());
-                    newsNotice.setRefId(mould.getId());
+//                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(Constant.MAIN_TAIN_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {
@@ -307,7 +307,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName());
-                    newsNotice.setRefId(mould.getId());
+//                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(Constant.SCRAP_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {
@@ -458,7 +458,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             NewsNotice newsNotice = new NewsNotice();
             newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
             newsNotice.setProjectName(project.getProjectName());
-            newsNotice.setRefId(mould.getId());
+//            newsNotice.setRefId(mould.getId());
             newsNotice.setContent(mou.getModelNo()+"-"+Constant.EMERGENCY_NOTICE);
             newsNoticeMapper.insert(newsNotice);
             //通知该模具所属资产方的管理员