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

@@ -92,13 +92,20 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     projectFile.setFileType(sufix);//文件后缀
                     projectFile.setFileUrl("/upload/" + fileName);
                     projectFile.setBlongType(blongType);
-                    if (user.getSubordinateType() == 0) {
-                        //上传人为资产方,自动审核通过
-                        projectFile.setState(1);
-                    } else if (user.getSubordinateType() == 1) {
-                        //上传人为生产方，自动审核通过
-                        projectFile.setState(2);
-                    } else {
+                    Mould mou = mouldMapper.selectById(userVO.getMouldId());
+                    Project project = projectMapper.selectById(mou.getProjectId());
+                    Integer count = projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId()).eq("project_id", project.getId()));
+                    if(count>0){
+                        if (user.getSubordinateType() == 0) {
+                            //上传人为资产方审批人,自动审核通过
+                            projectFile.setState(1);
+                        } else if (user.getSubordinateType() == 1) {
+                            //上传人为生产方，自动审核通过
+                            projectFile.setState(2);
+                        } else {
+                            projectFile.setState(0);
+                        }
+                    }else{
                         projectFile.setState(0);
                     }
                     File saveFile = new File(dir, fileName);
@@ -161,7 +168,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     //添加消息通知记录
                     Mould mould = mouldMapper.selectById(userVO.getMouldId());
                     if (mould.getProjectId() != null) {
-                        Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("id", mould.getProjectId()));
                         List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
                         String content = "";
                         for (ProjectApprove projectApprove : projectApproves) {