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

@@ -496,6 +496,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
             List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId())).stream().map(User::getId).collect(Collectors.toList());
             uids.addAll(userIds);
+            qw.in("id",uids).ne("id",id);
         }else{
             //项目经理
             if(null != projectId){
@@ -504,9 +505,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
                 List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId())).stream().map(User::getId).collect(Collectors.toList());
                 uids.addAll(userIds);
+                qw.in("id",uids);
             }
         }
-        qw.in("id",uids).ne("id",id);
         msg.data = userMapper.selectList(qw);
         return msg;
     }