From 9614014e2961c242ba5ef0375f10f5e0809a8b05 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Fri, 17 Mar 2023 11:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/service/impl/WorkOrderServiceImpl.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
index 702b3a7..e0860ff 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
@@ -653,7 +653,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 varMap.put("startTime", historicProcessInstance.getStartTime());
                 varMap.put("endTime", historicProcessInstance.getEndTime());
                 varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName());
-                varMap.put("startDeptId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getDeptId());
+                varMap.put("startDeptId", varMap.get("guanlibumen"));
                 varMap.put("processInstanceId", historicProcessInstance.getId());
 
                 List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByTaskCreateTime().desc().list();
@@ -668,11 +668,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         List<Map<String, Object>> workOrderList = new ArrayList<>();
         List<String> deptIds = Func.toStrList(AuthUtil.getDeptId());
         workOrders.forEach(order -> {
-            List<String> deptId = Func.toStrList(order.get("startDeptId").toString());
-            for (String s : deptId) {
-                if (deptIds.contains(s)) {
-                    workOrderList.add(order);
-                }
+            String deptId = order.get("startDeptId").toString();
+            if (deptIds.contains(deptId)) {
+                workOrderList.add(order);
             }
         });
         workOrders = workOrderList;