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

@@ -132,7 +132,13 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 map.put("download", 1);
                 map.put("view", 1);
                 map.put("approve", approve);
-            } else {
+            } else if(projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0){
+                //是否为审批人
+                map.put("update", 0);
+                map.put("download", 1);
+                map.put("view", 1);
+                map.put("approve", 1);
+            }else{
                 //该项目的参与人
                 Integer update = 0;
                 Integer download = 0;

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

@@ -267,6 +267,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("download", 1);
             map.put("view", 1);
             map.put("approve", approve);
+        }else if(projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0){
+                //是否为审批人
+                map.put("update", 0);
+                map.put("download", 1);
+                map.put("view", 1);
+                map.put("approve", 1);
         } else {
             //该项目的参与人
             Integer update = 0;

cloud-model/src/main/resources/mapper/MouldFileMapper.xml

@@ -227,6 +227,4 @@
         and
             state = 3
     </select>
-
-
 </mapper>