From 16b52bcef4419115ace6c57bd0423a51a9f49157 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 27 六月 2025 16:31:16 +0800
Subject: [PATCH] 增加对企业微信登录回调url中token的获取

---
 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
index 8ce1dab..5fd4330 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1069,11 +1069,18 @@
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                     .processInstanceId(flowTaskDto.getProcInsId())
                     .singleResult();
-            SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
-            flowTaskDto.setStartUserId(startUser.getUsername());
-            flowTaskDto.setStartUserName(startUser.getRealname());
-            List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
-            flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername,"锛�"));
+            if(historicProcessInstance != null) {
+                SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
+                if(startUser == null) {
+                    flowTaskDto.setStartUserId("");
+                    flowTaskDto.setStartUserName("");
+                }else {
+                    flowTaskDto.setStartUserId(startUser.getUsername());
+                    flowTaskDto.setStartUserName(startUser.getRealname());
+                }
+                List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
+                flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername,"锛�"));
+            }
         });
         IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
         flowTaskDtoIPage.setRecords(list);

--
Gitblit v1.9.3