瀏覽代碼

fix: 类型

liuc 4 月之前
父節點
當前提交
cb57fa08c6

+ 5 - 0
bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/FormEngineController.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cloud.sa.flow.commom.common.model.StCodeMsg;
 import com.cloud.sa.flow.commom.common.model.StResult;
+import com.cloud.sa.flow.commom.common.system.StUserInfo;
 import com.cloud.sa.flow.commom.domain.entity.*;
 import com.cloud.sa.flow.commom.domain.virentity.DynamicDataParam;
 import com.cloud.sa.flow.commom.domain.virentity.FormLoadDataParam;
 import com.cloud.sa.flow.commom.domain.virentity.StCommentVo;
 import com.cloud.sa.flow.engine.service.form.StFormService;
 import com.cloud.sa.flow.commom.domain.virentity.StFormModule;
+import com.wx.blink.base.common.domain.RequestUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,7 +46,9 @@ public class FormEngineController {
      */
     @PostMapping("/getFormLoadTemplate")
     public StResult getFormLoadTemplate(@RequestBody FormLoadDataParam formLoadDataParam) {
+        RequestUser user = StUserInfo.getUser();
         CompletableFuture<StFormModule> formLoadTemplateFuture = CompletableFuture.supplyAsync(() -> {
+            StUserInfo.setUser(user);
             return service.getFormLoadTemplate(formLoadDataParam.getFlowCode(),
                     formLoadDataParam.getBizObjectID(),
                     formLoadDataParam.getTaskid(),
@@ -52,6 +56,7 @@ public class FormEngineController {
                     formLoadDataParam.getTag());
         });
         CompletableFuture<JSONObject> dynamicDataFuture = CompletableFuture.supplyAsync(() -> {
+            StUserInfo.setUser(user);
             DynamicDataParam dynamicDataParam = new DynamicDataParam();
             dynamicDataParam.setStoredIds(formLoadDataParam.getStoredIds());
             dynamicDataParam.setFlowCode(formLoadDataParam.getFlowCode());

+ 9 - 0
bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/common/system/StUserInfo.java

@@ -3,6 +3,7 @@ package com.cloud.sa.flow.commom.common.system;
 import com.cloud.sa.flow.commom.common.utils.StString;
 import com.cloud.sa.flow.commom.domain.common.StGlobalConstant;
 import com.cloud.sa.flow.commom.domain.virentity.StUser;
+import com.wx.blink.base.common.domain.RequestUser;
 import com.wx.blink.base.common.util.BlinkRequestUtil;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +23,14 @@ public class StUserInfo {
     public static final ThreadLocal<String> threadLocalValueUserCode = new ThreadLocal<>();
     public static final ThreadLocal<String> threadLocalValueUserName = new ThreadLocal<>();
 
+    public static RequestUser getUser() {
+        return BlinkRequestUtil.getRequestUser();
+    }
+
+    public static void setUser(RequestUser requestUser) {
+        BlinkRequestUtil.setRequestUser(requestUser);
+    }
+
     public static String getUserCode() {
         Object userDetails = getLoginUser();
         if (userDetails != null) {