Merge branch 'dev_tide' into dev_tide_cbsglxt

zouyu

3 天以前 4809db01709fd66fe3a25452ef41a6378b6ac6c8

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

@@ -132,7 +132,7 @@
        ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
        approveProcess.setApproveStatus(status);
        if(approveNode1 != null){
            approveProcess.setApproveUserCurrentId(approveNode.getApproveNodeUserId());
            approveProcess.setApproveUserCurrentId(approveNode1.getApproveNodeUserId());
            approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
        }
        approveProcessMapper.updateById(approveProcess);