Browse Source

下级单位已审核,轮到本单位审核

buzhanyi 1 year ago
parent
commit
ef5539b856

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

@@ -830,12 +830,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                             .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"))) {
+                        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"))) {
+                        } else 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;