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 用户凭证，
+     * token 用户凭证，projectId 项目id ,inviteeId 被邀请人id
      * 参数：
      * @return
      */

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

@@ -1,8 +1,10 @@
 package com.hssx.cloudmodel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.InvitationRecord;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.UserVO;
-import com.hssx.cloudmodel.mapper.InvitationRecordMapper;
+import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.InvitationRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -23,9 +25,34 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
 
     @Resource
     InvitationRecordMapper invitationRecordMapper;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    ProjectUserMapper projectUserMapper;
+    @Resource
+    CompanyMapper companyMapper;
+    @Resource
+    CustomCompanyMapper customCompanyMapper;
+    @Resource
+    MouldMapper mouldMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
+    @Resource
+    PowerMapper powerMapper;
     @Override
     public HttpRespMsg add(InvitationRecord invitationRecord,String token) {
         HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        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()));
+        }
+//        HttpRespMsg msg = new HttpRespMsg();
 
         return null;
     }

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

@@ -40,6 +40,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     ProjectMapper projectMapper;
     @Resource
     ProjectApproveMapper projectApproveMapper;
+    @Resource
+    CustomCompanyMapper customCompanyMapper;
 
     @Override
     public HttpRespMsg login(UserVO userVO, HttpServletRequest request) {
@@ -74,22 +76,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<UserVO> users = new ArrayList<>();
-        List<Integer>  uIds = new ArrayList<>();
-        if(Constant.SYS_PARENT_ID == user.getParentId()){
+        List<Integer> uIds = new ArrayList<>();
+        if (Constant.SYS_PARENT_ID == user.getParentId()) {
             users = userMapper.selectListByCondition(roleType, companyId, flag, user, keyName);
         } else if (Constant.SYS_ID == user.getParentId()) {
-            QueryWrapper<Project> qwr = new QueryWrapper<>();
-            //资产方管理员,看到自己创建的项目下的所有人
-            qwr.select("id").eq("creator_id", user.getId());
-            uIds = projectMapper.selectList(qwr).stream().map(Project::getManagerId).collect(Collectors.toList());
-            List<Integer> projectIds = projectMapper.selectList(qwr).stream().map(Project::getId).collect(Collectors.toList());
-            projectIds.add(-1);
-            List<Integer> projectUserIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", projectIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
-            uIds.addAll(projectUserIds);
-            List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
-            uIds.addAll(projectApproveIds);
-            uIds.add(-1);
-            users = userMapper.selectUserListByCondition(roleType, companyId, flag,keyName,uIds);
+            if (user.getSubordinateType() == 0) {
+                QueryWrapper<Project> qwr = new QueryWrapper<>();
+                //资产方管理员,看到自己创建的项目下的所有人
+                qwr.select("id").eq("creator_id", user.getId());
+                uIds = projectMapper.selectList(qwr).stream().map(Project::getManagerId).collect(Collectors.toList());
+                List<Integer> projectIds = projectMapper.selectList(qwr).stream().map(Project::getId).collect(Collectors.toList());
+                projectIds.add(-1);
+                List<Integer> projectUserIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", projectIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+                uIds.addAll(projectUserIds);
+                List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
+                uIds.addAll(projectApproveIds);
+                uIds.add(-1);
+                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
+            } else if (user.getSubordinateType() == 1) {
+                List<Integer> projectIds = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", user.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
+                projectIds.add(-1);
+                uIds = projectMapper.selectList(new QueryWrapper<Project>().in("id", projectIds)).stream().map(Project::getManagerId).collect(Collectors.toList());
+                List<Integer> projectUserIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", projectIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+                uIds.addAll(projectUserIds);
+                List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
+                uIds.addAll(projectApproveIds);
+                uIds.add(-1);
+                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
+            }
         } else {
             List<Integer> pIds = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", user.getId())).stream().map(Project::getId).collect(Collectors.toList());
             pIds.add(-1);
@@ -98,7 +112,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", pIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
             uIds.addAll(projectApproveIds);
             uIds.add(-1);
-            users = userMapper.selectUserListByCondition(roleType, companyId, flag,keyName,uIds);
+            users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
         }
         List<Project> projects = new ArrayList<>();
         for (UserVO userVO : users) {
@@ -109,17 +123,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
                     //系统超级管理员，可获得所有项目
                     projects = projectMapper.selectList(qw);
-                    for (Project project : projects) {
-                        set.add(project.getId());
-                    }
+//                    for (Project project : projects) {
+//                        set.add(project.getId());
+//                    }
                     userVO.setProjects(projects);
                 } else if (Constant.SYS_ID == userVO.getParentId()) {
                     //资产方管理员,看到自己创建的项目
-                    qw.select("id").eq("creator_id", userVO.getId());
+                    qw.eq("creator_id", userVO.getId());
                     projects = projectMapper.selectList(qw);
-                    for (Project project : projects) {
-                        set.add(project.getId());
-                    }
+//                    for (Project project : projects) {
+//                        set.add(project.getId());
+//                    }
                     userVO.setProjects(projects);
                 } else {
                     QueryWrapper<Project> qwPro = new QueryWrapper<>();
@@ -183,7 +197,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (null != user.getPassword()) {
             newUser.setPassword(MD5Util.getPassword(user.getPassword()));
         }
-        if(null != user.getUsername()){
+        if (null != user.getUsername()) {
             newUser.setUsername(user.getUsername());
         }
         userMapper.updateById(newUser);
@@ -274,7 +288,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         //添加项目参与人记录
                         if (projectIds != null) {
                             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
-                            ids.stream().forEach(e ->{
+                            ids.stream().forEach(e -> {
                                 ProjectUser projectUser = new ProjectUser();
                                 projectUser.setProjectId(e);
                                 projectUser.setSubordinate(existingUser.getCompanyId());
@@ -310,7 +324,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //添加项目参与人记录
                     if (projectIds != null) {
                         List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
-                        ids.stream().forEach(e ->{
+                        ids.stream().forEach(e -> {
                             ProjectUser projectUser = new ProjectUser();
                             projectUser.setProjectId(e);
                             projectUser.setSubordinate(user.getCompanyId());
@@ -375,7 +389,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //添加项目参与人记录
                     if (projectIds != null) {
                         ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
-                        ids.stream().forEach(e ->{
+                        ids.stream().forEach(e -> {
                             ProjectUser projectUser = new ProjectUser();
                             projectUser.setProjectId(e);
                             projectUser.setSubordinate(existingUser.getCompanyId());
@@ -410,7 +424,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //添加项目参与人记录
                     if (projectIds != null) {
                         List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
-                        ids.stream().forEach(e ->{
+                        ids.stream().forEach(e -> {
                             ProjectUser projectUser = new ProjectUser();
                             projectUser.setProjectId(e);
                             projectUser.setSubordinate(user.getCompanyId());

cloud-model/src/main/resources/application.properties

@@ -39,6 +39,8 @@ upload.path=D:/mould/upload/
 ######################################################################################################
 # 文件上传路径
 download.path=D:/mould/download/
+# 邀请人员链接前缀
+invitation.url.prefix=https://localhost:8090/#/invite/
 #######################################################################################################
 # 配置上传文件的大小设置
 # Single file max size  即单个文件大小