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

@@ -145,10 +145,17 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 map.put("approve", 0);
             } else if (Constant.SYS_ID == currentUser.getParentId()) {
                 //当前为系统管理员
-                map.put("update", 1);
-                map.put("download", 1);
-                map.put("view", 1);
-                map.put("approve", 0);
+                if(Constant.ASSETS_COMPANY == currentUser.getSubordinateType()){
+                    map.put("update", 1);
+                    map.put("download", 1);
+                    map.put("view", 1);
+                    map.put("approve", 0);
+                }else if(Constant.PRODUCER_COMPANY == currentUser.getSubordinateType()){
+                    map.put("update", 0);
+                    map.put("download", 1);
+                    map.put("view", 1);
+                    map.put("approve", 0);
+                }
             } else if (vo.getManagerId() == currentUser.getId()) {
                 //当前人是该项目的项目经理
                 Integer approve = 0;

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

@@ -46,7 +46,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if(user != null){
-            if (file != null && !file.isEmpty()) {
+            if (file != null) {
                 ProjectFile projectFile = new ProjectFile();
                 projectFile.setUploaderId(user.getId());
                 projectFile.setUploader(user.getUsername());
@@ -58,7 +58,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
                     dir.mkdirs();
                 }
                 String fileName = "";
-                if (file != null && !file.isEmpty()) {
+                if (file != null) {
                     fileName = file.getOriginalFilename();
                     projectFile.setFileName(fileName);
                     projectFile.setFileSize(FileUtil.getReadableFileSize(file.getSize()));

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

@@ -322,10 +322,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("approve", 0);
         } else if (Constant.SYS_ID == currentUser.getParentId()) {
             //当前为系统管理员
-            map.put("update", 1);
-            map.put("download", 1);
-            map.put("view", 1);
-            map.put("approve", 0);
+            if(Constant.ASSETS_COMPANY == currentUser.getSubordinateType()){
+                map.put("update", 1);
+                map.put("download", 1);
+                map.put("view", 1);
+                map.put("approve", 0);
+            }else if(Constant.PRODUCER_COMPANY == currentUser.getSubordinateType()){
+                map.put("update", 0);
+                map.put("download", 1);
+                map.put("view", 1);
+                map.put("approve", 0);
+            }
         } else if (vo.getManagerId() == currentUser.getId()) {
             //当前人是该项目的项目经理
             Integer approve = 0;
@@ -462,9 +469,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             //资产方管理员，获取他公司下的所有模具
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
             if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
+                //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
             } else if (Constant.SYS_ID == userVO.getParentId()) {
-                moulds = mouldMapper.selectListByCondition(userVO);
+
+                if(Constant.ASSETS_COMPANY == userVO.getSubordinateType()){
+                    //资产方管理员
+                    moulds = mouldMapper.selectListByCondition(userVO);
+                }else if(Constant.PRODUCER_COMPANY == userVO.getSubordinateType()){
+                    moulds = mouldMapper.selectListByCondition(userVO);
+                }
             } else {
                 //普通用户或者项目经理
                 //充当项目经理参与的项目