From f1e34c06fdc3a1726d448d085ad97cd91838c8fb Mon Sep 17 00:00:00 2001
From: yangyang01000846 <15195822163@163.com>
Date: Wed, 14 Jan 2026 19:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Ahpc=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96,mock=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sdm/flowable/delegate/handler/HpcHandler.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
index 286565d8..d741b36b 100644
--- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
+++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java
@@ -77,7 +77,7 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
         }
         CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr);
         // 初始化用户/租户信息
-        initUserInfo(execution);
+        initUserInfo(execution,params);
         // params 取只是测试使用
         String processDefinitionId = (execution==null||StringUtils.isBlank(execution.getProcessDefinitionId()))?
                 params.get("processDefinitionId").toString():execution.getProcessDefinitionId();
@@ -136,17 +136,17 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
         messageFeignClient.sendMessage(req);
     }
 
-    private void initUserInfo(DelegateExecution execution) {
+    private void initUserInfo(DelegateExecution execution,Map<String, Object> params) {
         // 获取当前流程实例参数
         Long userId = (Long) execution.getVariable("userId");
         String userName = (String) execution.getVariable("userName");
         Long tenantId = (Long) execution.getVariable("tenantId");
         log.info("Hpc流程发起，用户id:{},租户id:{}",userId,tenantId);
         if(Objects.isNull(tenantId)){
-            tenantId=ThreadLocalContext.getTenantId();
+            tenantId=Objects.isNull(params.get("tenantId")) ? null : (Long) params.get("tenantId");
         }
         if(Objects.isNull(userId)){
-            tenantId=ThreadLocalContext.getUserId();
+            userId=Objects.isNull(params.get("userId")) ? null : (Long) params.get("userId");
         }
         ThreadLocalContext.setUserId(userId);
         ThreadLocalContext.setUserName(userName);