Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

7 天以前 91038896d296db86b5dc166777dcdbf8ff2ea56f

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -80,11 +80,9 @@
                .map(ApproveProcessConfigNodeVo::getApproverId)
                .filter(Objects::nonNull)
                .collect(Collectors.toList());
        if (list.isEmpty()) {
            throw new RuntimeException("流程不存在");
        }
        // 无审核人逻辑添加
        if (CollectionUtils.isEmpty(nodeIds)) {
            autoPassPurchaseApproveIfNoApprover(approveProcessVO);
            autoPassPurchaseApproveIfNoApprover(approveProcessVO); // 采购单无审核人逻辑
            return;
        }
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(nodeIds);
@@ -451,6 +449,8 @@
                return "发货审批";
            case 8:
                return "危险作业审批";
            case 9:
                return "办公用品审批";
        }
        return null;
    }