Merge branch 'master' into prod

purchase-admin/src/main/resources/application-prod.yml

@@ -110,9 +110,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size:  10MB
+      max-file-size: 50MB
       # 设置总上传的文件大小
-      max-request-size:  20MB
+      max-request-size: 1GB
   # 服务模块
   devtools:
     restart:

purchase-admin/src/main/resources/application-test.yml

@@ -55,9 +55,9 @@ spring:
   servlet:
      multipart:
        # 单个文件大小
-       max-file-size:  10MB
+       max-file-size: 50MB
        # 设置总上传的文件大小
-       max-request-size:  20MB
+       max-request-size: 1GB
   # 服务模块
   devtools:
     restart:

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -774,7 +774,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         list = pmAuditDeptRefService.list(l);
         if (!pmDemandReqVo.getIsAdmin()) {
             if (!ObjectUtils.isEmpty(list)) {
-                lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
+                //lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
                 lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toSet()));
             }
         }
@@ -809,36 +809,36 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<PmDemandResVo> pmDemandResVos = demandChangeTo(demandList);
             for (PmDemandResVo vo : pmDemandResVos) {
                 // 根据项目id 和 部门id 和 参数类型 获取 部门级别
+                //list是该部门参与审核的项目
                 List<PmAuditDeptRef> collect = list.stream()
                         .filter(o -> o.getRefId().equals(vo.getDemandId()))
                         .collect(Collectors.toList());
 
                 if (!ObjectUtils.isEmpty(collect)) {
+                    //部门在这个项目的审核等级**
                     String deptLevel = collect.get(0).getDeptLevel();
 
-                    // 根据项目id  和 参数类型 获取 所有审核数据
+                    // 根据项目id  和 参数类型 获取 该项目的所有审核数据
                     LambdaQueryWrapper<PmAuditDeptRef> ll = new LambdaQueryWrapper<>();
                     ll.eq(PmAuditDeptRef::getRefId, vo.getDemandId());
                     ll.eq(PmAuditDeptRef::getRefType, "2");
-                    List<PmAuditDeptRef> listl = pmAuditDeptRefService.list(l);
+                    List<PmAuditDeptRef> listl = pmAuditDeptRefService.list(ll);
 
-                    // 判断当前用户是否有审核权限
+                    // 判断当前用户是否可以进行审核
                     boolean flay = true;
                     //是否为本单位已审核过的数据
                     boolean fg = false;
-                    List<PmAuditDeptRef> collect1 = listl.stream()
-                            .filter(pmAuditDeptRef -> pmAuditDeptRef.getRefId().equals(vo.getDemandId()))
-                            .collect(Collectors.toList());
-                    for (PmAuditDeptRef pmAuditDeptRef : collect1) {
-                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) > 0
-                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
-                            //自己下级单位未进行审核时。不显示审核按钮
-                            flay = false;
-                        } else if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == 0
-                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("1"))) {
+                    for (PmAuditDeptRef pmAuditDeptRef : listl) {
+                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) < 0 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("1"))) {
+                            //下级单位已审核，轮到本单位审核
+                            fg = true;
+                        } else if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == 0 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("1"))) {
                             //本单位已审核
                             flay = false;
                             fg = true;
+                        } else if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == 0 && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                            //本单位未进行审核
+                            fg = true;
                         }
                     }
                     vo.setFlay(flay);