From 601eca3d487e9833ffc6253579bb85496f767f23 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 05 十一月 2026 16:18:24 +0800
Subject: [PATCH] fix(bpm): 修复流程模型修改后保存报「你不是该流程的管理员」
---
sql/mysql/bpm_fix_model_manager_and_rev.sql | 31 +++++++++++++++++++++++++++++++
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java | 23 ++++++++++++++++++++---
2 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/sql/mysql/bpm_fix_model_manager_and_rev.sql b/sql/mysql/bpm_fix_model_manager_and_rev.sql
new file mode 100644
index 0000000..55c7fa6
--- /dev/null
+++ b/sql/mysql/bpm_fix_model_manager_and_rev.sql
@@ -0,0 +1,31 @@
+-- ============================================================
+-- 淇銆屾祦绋嬫ā鍨� 鈫� 淇敼 鈫� 娴佺▼璁捐 鈫� 淇濆瓨銆嶅け璐�
+--
+-- 鐜拌薄锛氭姤銆屾搷浣滄祦绋嬪け璐ワ紝鍘熷洜锛氫綘涓嶆槸璇ユ祦绋�(xxx)鐨勭鐞嗗憳銆嶏紝
+-- 鎴栦慨鎺夌鐞嗗憳闂鍚庡彉鎴愩�岀郴缁熷紓甯搞��
+-- 锛團lowableOptimisticLockingException: was updated by another transaction concurrently锛�
+--
+-- 鏍瑰洜鏈変袱涓紝閮藉嚭鍦ㄤ粠澶囦唤鎭㈠/杩佺Щ杩囨潵鐨� act_re_model 鏁版嵁涓婏細
+--
+-- 1) META_INFO_ 閲� managerUserIds 涓虹┖鏁扮粍鎴栫己澶�
+-- 鍚庣 updateModel 鏄�屽厛鏍¢獙绠$悊鍛樸�佸悗鍐欏叆銆嶏紝鏍¢獙璇荤殑鏄簱閲岀殑鍊硷紝
+-- 鎵�浠ヤ竴鏃︿负绌哄氨姘镐箙鏍¢獙澶辫触锛屾棤娉曡嚜鎰堬紙鍓嶇鎬庝箞浼犳柊鍊奸兘娌$敤锛夈��
+--
+-- 2) REV_锛團lowable 涔愯閿佺増鏈彿锛変负 NULL
+-- saveModel 鏃剁殑 UPDATE 鏉′欢甯� REV_ = ?锛屼负 NULL 鏃跺尮閰嶄笉鍒颁换浣曡锛�
+-- Flowable 璁や负琚苟鍙戜慨鏀癸紝鎶� OptimisticLockingException 鈫� 鍓嶇鏄剧ず銆岀郴缁熷紓甯搞�嶃��
+--
+-- 鎵ц鍚庨渶閲嶅惎鍚庣鏈嶅姟锛團lowable 鏈夋ā鍨嬬紦瀛橈級銆�
+-- ============================================================
+
+-- 1) 琛ラ綈娴佺▼绠$悊鍛橈細绌烘暟缁� 鈫� 瓒呯(1)锛涚己澶辫瀛楁鐨勶紝琛ュ埌 visible 鍚庨潰
+UPDATE act_re_model
+SET META_INFO_ = REPLACE(META_INFO_, '"managerUserIds":[]', '"managerUserIds":[1]')
+WHERE META_INFO_ LIKE '%"managerUserIds":[]%';
+
+UPDATE act_re_model
+SET META_INFO_ = REPLACE(META_INFO_, '"visible":true', '"visible":true,"managerUserIds":[1]')
+WHERE META_INFO_ NOT LIKE '%managerUserIds%';
+
+-- 2) 琛ラ綈涔愯閿佺増鏈彿
+UPDATE act_re_model SET REV_ = 1 WHERE REV_ IS NULL;
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 9ef6970..839d45d 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
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
@@ -204,10 +205,26 @@
private Model validateModelManager(String id, Long userId) {
Model model = validateModelExists(id);
BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
- if (metaInfo == null || !CollUtil.contains(metaInfo.getManagerUserIds(), userId)) {
- throw exception(MODEL_UPDATE_FAIL_NOT_MANAGER, model.getName());
+ // 1. 鏈厤缃祦绋嬬鐞嗗憳 鈫� 鏀捐銆�
+ // 鍘嗗彶妯″瀷锛堝浠芥仮澶�/杩佺Щ锛塎ETA_INFO 閲� managerUserIds 涓虹┖鏁扮粍鎴栫己澶憋紝
+ // 鑰� updateModel 鏄�屽厛鏍¢獙鍚庡啓鍏ャ�嶏紝涓�鏃︿负绌哄氨浼氭案涔呮牎楠屽け璐ワ紝鏃犳硶鑷剤銆�
+ if (metaInfo == null || CollUtil.isEmpty(metaInfo.getManagerUserIds())) {
+ log.warn("[validateModelManager][妯″瀷({}) 鏈厤缃祦绋嬬鐞嗗憳锛岃烦杩囩鐞嗗憳鏍¢獙]", model.getName());
+ return model;
}
- return model;
+ // 2. 褰撳墠鎿嶄綔浜哄湪绠$悊鍛樺垪琛ㄩ噷 鈫� 鏀捐
+ if (CollUtil.contains(metaInfo.getManagerUserIds(), userId)) {
+ return model;
+ }
+ // 3. 瓒呯骇绠$悊鍛樺缁堟斁琛屻��
+ // 鍚﹀垯妯″瀷涓�鏃﹁淇濆瓨鎴愬彧鍖呭惈鏌愪釜鍏蜂綋璐﹀彿锛屾崲璐﹀彿锛堝惈瓒呯锛夊氨鍐嶄篃鏀逛笉浜嗚妯″瀷锛�
+ // 鎶ャ�屾搷浣滄祦绋嬪け璐ワ紝鍘熷洜锛氫綘涓嶆槸璇ユ祦绋�(xxx)鐨勭鐞嗗憳銆嶏紝褰㈡垚姝婚攣銆�
+ if (SecurityFrameworkUtils.isSuperAdmin()) {
+ log.warn("[validateModelManager][妯″瀷({}) 绠$悊鍛�({}) 涓嶅惈褰撳墠鐢ㄦ埛({})锛屼絾涓鸿秴绾х鐞嗗憳锛屾斁琛宂",
+ model.getName(), metaInfo.getManagerUserIds(), userId);
+ return model;
+ }
+ throw exception(MODEL_UPDATE_FAIL_NOT_MANAGER, model.getName());
}
@Override
--
Gitblit v1.9.3