From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessConfigNodeServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessConfigNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessConfigNodeServiceImpl.java
index 6d4124c..e067fc4 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessConfigNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessConfigNodeServiceImpl.java
@@ -27,7 +27,10 @@
private final ApproveProcessConfigNodeMapper approveProcessConfigNodeMapper;
@Override
public List<ApproveProcessConfigNodeVo> listNode(Integer type) {
- List<ApproveProcessConfigNode> approveProcessConfigNodes = approveProcessConfigNodeMapper.selectList(new QueryWrapper<ApproveProcessConfigNode>().lambda().eq(ApproveProcessConfigNode::getApproveType, type).orderByAsc(ApproveProcessConfigNode::getNodeOrder));
+ List<ApproveProcessConfigNode> approveProcessConfigNodes = approveProcessConfigNodeMapper.selectList(new QueryWrapper<ApproveProcessConfigNode>().lambda()
+ .eq(ApproveProcessConfigNode::getApproveType, type)
+ .orderByAsc(ApproveProcessConfigNode::getNodeOrder)
+ .orderByAsc(ApproveProcessConfigNode::getId));
return approveProcessConfigNodes.stream()
.map(node -> {
ApproveProcessConfigNodeVo vo = new ApproveProcessConfigNodeVo();
@@ -43,6 +46,10 @@
approveProcessConfigNodeMapper.delete(new QueryWrapper<ApproveProcessConfigNode>().lambda().eq(ApproveProcessConfigNode::getApproveType, approveProcessConfigNodes.get(0).getApproveType()));
//鏂板 鏁版嵁
for (ApproveProcessConfigNode node : approveProcessConfigNodes) {
+ // 榛樿鎴栫妯″紡锛屽吋瀹规湭浼� approve_mode 鐨勬棫鏁版嵁
+ if (node.getApproveMode() == null || node.getApproveMode().isEmpty()) {
+ node.setApproveMode("or");
+ }
approveProcessConfigNodeMapper.insert(node);
}
return true;
--
Gitblit v1.9.3