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/CompanyServiceImpl.java

@@ -338,7 +338,15 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             msg.setError("当前用户不存在或者不存在");
             return msg;
         }else{
-            msg.data = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id",userVO.getProjectId()));
+            Integer ownerCompany = projectMapper.selectById(userVO.getId()).getOwnerCompany();
+            List<Integer> companyIds = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>()
+                    .eq("project_id", userVO.getProjectId()))
+                    .stream()
+                    .map(CustomCompany::getCompanyId)
+                    .collect(Collectors.toList());
+            companyIds.add(ownerCompany);
+            List<Company> list = companyMapper.selectList(new QueryWrapper<Company>().in("id", companyIds));
+            msg.data = list;
         }
         return msg;
     }

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

@@ -88,6 +88,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     for (Project project : projects) {
                         set.add(project.getId());
                     }
+                    userVO.setProjects(projects);
                 } else if (Constant.SYS_ID == userVO.getParentId()) {
                     //资产方管理员,看到自己创建的项目
                     qw.select("id").eq("creator_id", user.getId());
@@ -95,6 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     for (Project project : projects) {
                         set.add(project.getId());
                     }
+                    userVO.setProjects(projects);
                 } else {
                     QueryWrapper<Project> qwPro = new QueryWrapper<>();
                     qwPro.eq("manager_id", user.getId());
@@ -114,8 +116,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     }
                     qw.in("id", set);
                     projects = projectMapper.selectList(qw);
+                    userVO.setProjects(projects);
                 }
-                userVO.setProjects(projects);
             } else {
                 msg.setError("当前用户未登录，或者用户不存在");
             }