opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复 多次驳回无法锁定审批人问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2026-05-28 15:00:37 +08:00
parent cef1797828
commit 511fb6c8d5
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java
View File

@ -2,6 +2,7 @@ package org.dromara.common.mybatis.helper;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
@ -15,6 +16,8 @@ import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* 数据库助手 * 数据库助手
@ -25,6 +28,7 @@ import java.util.List;
public class DataBaseHelper { public class DataBaseHelper {
private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class); private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class);
private static final Map<String, DataBaseType> DB_TYPE_CACHE = new ConcurrentHashMap<>();
/** /**
* 获取当前数据源对应的数据库类型 * 获取当前数据源对应的数据库类型
@ -38,6 +42,9 @@ public class DataBaseHelper {
*/ */
public static DataBaseType getDataBaseType() { public static DataBaseType getDataBaseType() {
DataSource dataSource = DS.determineDataSource(); DataSource dataSource = DS.determineDataSource();
String dsKey = DynamicDataSourceContextHolder.peek();
final String key = dsKey != null ? dsKey : "primary";
return DB_TYPE_CACHE.computeIfAbsent(key, k -> {
try (Connection conn = dataSource.getConnection()) { try (Connection conn = dataSource.getConnection()) {
DatabaseMetaData metaData = conn.getMetaData(); DatabaseMetaData metaData = conn.getMetaData();
String databaseProductName = metaData.getDatabaseProductName(); String databaseProductName = metaData.getDatabaseProductName();
@ -45,6 +52,7 @@ public class DataBaseHelper {
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException("获取数据库类型失败", e); throw new RuntimeException("获取数据库类型失败", e);
} }
});
} }
/** /**
@ -56,6 +64,7 @@ public class DataBaseHelper {
*/ */
public static DataBaseType getDataBaseType(String dsName) { public static DataBaseType getDataBaseType(String dsName) {
DataSource dataSource = DS.getDataSource(dsName); DataSource dataSource = DS.getDataSource(dsName);
return DB_TYPE_CACHE.computeIfAbsent(dsName, k -> {
try (Connection conn = dataSource.getConnection()) { try (Connection conn = dataSource.getConnection()) {
DatabaseMetaData metaData = conn.getMetaData(); DatabaseMetaData metaData = conn.getMetaData();
String databaseProductName = metaData.getDatabaseProductName(); String databaseProductName = metaData.getDatabaseProductName();
@ -63,6 +72,7 @@ public class DataBaseHelper {
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException("获取数据库类型失败", e); throw new RuntimeException("获取数据库类型失败", e);
} }
});
} }
/** /**
@ -95,7 +105,9 @@ public class DataBaseHelper {
} }
/** /**
* 获取当前加载的数据库名 * 获取当前注册的数据源名称列表。
*
* @return 数据源名称列表
*/ */
public static List<String> getDataSourceNameList() { public static List<String> getDataSourceNameList() {
return new ArrayList<>(DS.getDataSources().keySet()); return new ArrayList<>(DS.getDataSources().keySet());

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
View File

@ -159,11 +159,13 @@ public class WorkflowGlobalListener implements GlobalListener {
String[] userIdArray = userIds.split(StringUtils.SEPARATOR); String[] userIdArray = userIds.split(StringUtils.SEPARATOR);
if (userIdArray.length > 0) { if (userIdArray.length > 0) {
flowTask.setPermissionList(List.of(userIdArray)); flowTask.setPermissionList(List.of(userIdArray));
// 移除已处理的状态变量 if (TaskStatusEnum.PASS.getStatus().equals(taskStatus)) {
// 办理指定人变量只消费一次；驳回指定人变量需要保留给后续重复驳回。
variable.remove(nodeKey); variable.remove(nodeKey);
FlowEngine.insService().removeVariables(flowTask.getInstanceId(), nodeKey); FlowEngine.insService().removeVariables(flowTask.getInstanceId(), nodeKey);
} }
} }
}
/** /**
* 完成监听器，当前任务完成后执行 * 完成监听器，当前任务完成后执行