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

@@ -79,7 +79,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         for (UserVO userVO : users) {
             List<Integer> set = new ArrayList<>();
             set.add(-1);
-            List<MouldVO> moulds = new ArrayList<>();
             if (userVO.getId() != null) {
                 QueryWrapper<Project> qw = new QueryWrapper<>();
                 if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
@@ -91,7 +90,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     userVO.setProjects(projects);
                 } else if (Constant.SYS_ID == userVO.getParentId()) {
                     //资产方管理员,看到自己创建的项目
-                    qw.select("id").eq("creator_id", user.getId());
+                    qw.select("id").eq("creator_id", userVO.getId());
                     projects = projectMapper.selectList(qw);
                     for (Project project : projects) {
                         set.add(project.getId());
@@ -99,13 +98,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     userVO.setProjects(projects);
                 } else {
                     QueryWrapper<Project> qwPro = new QueryWrapper<>();
-                    qwPro.eq("manager_id", user.getId());
+                    qwPro.eq("manager_id", userVO.getId());
                     List<Project> projectList = projectMapper.selectList(qwPro);
                     for (Project project : projectList) {
                         set.add(project.getId());
                     }
                     //项目经理或者普通用户
-                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", user.getId()));
+                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
                     for (ProjectUser projectUser : projectUsers) {
                         set.add(projectUser.getProjectId());
                     }