Merge branch 'dev_New' into dev_New_kthg

zss

7 天以前 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

Merge branch 'dev_New' into dev_New_kthg

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

@@ -155,7 +155,6 @@
        LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
        approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
                .eq(ApproveProcess::getApproveDelete, 0)
                .eq(ApproveProcess::getApproveStatus, 0)
                .last("limit 1");
        ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
        if(approveProcess == null) throw new RuntimeException("审批不存在");