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

@@ -270,20 +270,19 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<Integer> set = new ArrayList<>();
         set.add(-1);
-        List<MouldVO> moulds = new ArrayList<>();
+        List<Mould> moulds = new ArrayList<>();
         if (currentUser.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-             if (Constant.SYS_ID == userVO.getParentId()) {
-                moulds = mouldMapper.maintainMouldList(userVO);
+             if (Constant.SYS_ID == currentUser.getParentId()) {
+                 List<Project> projects = projectMapper.selectList(new QueryWrapper<Project>().eq("creator_id", currentUser.getId()));
+                 for (Project project : projects) {
+                     set.add(project.getId());
+                 }
             } else {
                 //普通用户或者项目经理
                 //充当项目经理参与的项目
-                if (userVO.getProjectId() != -1) {
-                    set.add(userVO.getProjectId());
-                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
-                } else {
                     QueryWrapper<Project> qw = new QueryWrapper<>();
-                    qw.eq("manager_id", userVO.getId());
+                    qw.eq("manager_id", currentUser.getId());
                     List<Project> projects = projectMapper.selectList(qw);
                     if (projects.size() > 0) {
                         for (Project project : projects) {
@@ -291,24 +290,23 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                         }
                     }
 //                //充当普通人员参与的项目
-                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
+                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", currentUser.getId()));
                     if (projectUsers.size() > 0) {
                         for (ProjectUser projectUser : projectUsers) {
                             set.add(projectUser.getProjectId());
                         }
                     }
 //                //充当审批人员参与的项目
-                    List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+                    List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
                     if (projectss.size() > 0) {
                         for (ProjectApprove projectUser : projectss) {
                             set.add(projectUser.getProjectId());
                         }
                     }
-                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+
                 }
-            }
-            PageInfo<MouldVO> pageInfo = new PageInfo<>(moulds);
-            msg.data = pageInfo;
+            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            msg.data = moulds;
         } else {
             msg.setError("用户不存在，或者未登录！");
         }