From 3427c23b5e1e321ac44802b4c30c0c4e08231ec0 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 11:13:38 +0800
Subject: [PATCH] fix(bpm): 超级管理员始终可维护流程模型,修复「你不是该流程的管理员」死锁
---
sql/mysql/fix_act_re_model_rev_null.sql | 28 ++++++++++++++++++++++++++++
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java | 8 ++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/fix_act_re_model_rev_null.sql b/sql/mysql/fix_act_re_model_rev_null.sql
new file mode 100644
index 0000000..460bdd4
--- /dev/null
+++ b/sql/mysql/fix_act_re_model_rev_null.sql
@@ -0,0 +1,28 @@
+-- =====================================================================
+-- 淇 ACT_RE_MODEL.REV_ 涓� NULL 瀵艰嚧娴佺▼妯″瀷淇濆瓨鎶� 500銆岀郴缁熷紓甯搞��
+--
+-- 鐜拌薄锛�
+-- 娴佺▼妯″瀷 鈫� 淇敼 鈫� 淇濆瓨 / 鍙戝竷锛屾姤銆屾搷浣滄祦绋嬪け璐ワ紝鍘熷洜锛氫綘涓嶆槸璇ユ祦绋�(xxx)鐨勭鐞嗗憳銆嶏紝
+-- 鎴栦繚瀛樻椂 500銆岀郴缁熷紓甯搞�嶏紙鏃ュ織涓� FlowableOptimisticLockingException锛夈��
+--
+-- 鏍瑰洜锛�
+-- 1) managerUserIds 涓虹┖锛圢ULL / []锛夋椂锛屽悗绔� validateModelManager 浠讳綍浜洪兘鏍¢獙涓嶈繃锛�
+-- 妯″瀷褰诲簳鍙樻垚銆屾棤涓汇�嶏紝璋侀兘鏃犳硶淇敼锛堟閿侊級鈫� 鐢卞悗绔唬鐮佹斁瀹戒负銆岃秴绾х鐞嗗憳濮嬬粓鏀捐銆嶃��
+-- 2) ACT_RE_MODEL.REV_ 鏄� Flowable 鐨勪箰瑙傞攣鐗堟湰鍒楋紝涓� NULL 鏃�
+-- UPDATE ... WHERE REV_ = NULL 姘歌繙鍖归厤涓嶅埌锛屾姏涔愯閿佸紓甯� 鈫� 闇�瑕佹妸 NULL 琛ユ垚 1銆�
+--
+-- 褰卞搷鑼冨洿锛堜慨澶嶅墠瀹炴祴锛夛細
+-- 鍖楁柟绉戞妧 mom-bfkj锛�21 涓ā鍨嬩腑 14 涓� REV_ 涓� NULL
+-- 钃濈窘绾镐笟 mom-lyzy锛�24 涓ā鍨嬩腑 14 涓� REV_ 涓� NULL
+--
+-- 鎵ц鏈剼鏈殑搴擄細mom-bfkj銆乵om-lyzy锛堜袱瀹堕兘瑕佹墽琛岋級
+-- =====================================================================
+
+-- 淇涔愯閿佺増鏈彿涓� NULL 鐨勮褰�
+UPDATE ACT_RE_MODEL SET REV_ = 1 WHERE REV_ IS NULL;
+
+-- 楠岃瘉锛氫笉搴斿啀鍑虹幇 NULL
+SELECT ifnull(cast(REV_ as char), '<NULL>') AS REV, COUNT(*) AS 鏉℃暟
+FROM ACT_RE_MODEL
+GROUP BY REV_
+ORDER BY REV_;
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
index 953115a..e5b5a3b 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
@@ -6,6 +6,7 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
@@ -204,6 +205,13 @@
private Model validateModelManager(String id, Long userId) {
Model model = validateModelExists(id);
BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
+ // 瓒呯骇绠$悊鍛樺缁堟嫢鏈夋祦绋嬫ā鍨嬬殑缁存姢鏉冮檺銆�
+ // 鑳屾櫙锛氬巻鍙叉ā鍨嬬殑 managerUserIds 鍙兘涓虹┖锛圢ULL / []锛夛紝鎴栨寚鍚戝凡鍒犻櫎 / 宸插彉鏇寸殑鐢ㄦ埛锛�
+ // 涓ユ牸鏍¢獙浼氳杩欎簺妯″瀷鍐嶄篃鏃犳硶淇敼锛堟閿侊紝瀹㈡埛鎶ャ�屼綘涓嶆槸璇ユ祦绋�(xxx)鐨勭鐞嗗憳銆嶅嵈鏃犳硶鑷剤锛夛紱
+ // 鍙﹀瀹㈡埛瑕佹眰鎶婃祦绋嬬鐞嗗憳鍥哄畾涓鸿秴绾х鐞嗗憳锛屾鏍¢獙瀵瑰叾涓嶅啀閫傜敤銆�
+ if (SecurityFrameworkUtils.isSuperAdmin()) {
+ return model;
+ }
if (metaInfo == null || !CollUtil.contains(metaInfo.getManagerUserIds(), userId)) {
throw exception(MODEL_UPDATE_FAIL_NOT_MANAGER, model.getName());
}
--
Gitblit v1.9.3