From 78b2f03b6d19a7c2300c1d1acbffae1607a65d8d Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 16 Apr 2024 19:23:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jyjz/flowable/service/impl/FlowTaskServiceImpl.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index 79588a36..c875b9e9 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -8,6 +8,8 @@ import cn.jyjz.flowable.domain.vo.*;
 import cn.jyjz.flowable.entity.FlowApprove;
 import cn.jyjz.flowable.entity.FlowTaskInfo;
 import cn.jyjz.flowable.service.IFlowInstanceService;
+import cn.jyjz.xiaoyao.admin.dataobject.Department;
+import cn.jyjz.xiaoyao.admin.service.DepartmentService;
 import cn.jyjz.xiaoyao.common.base.language.SystemMessage;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
@@ -103,7 +105,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private UserFinalService userFinalService;
     @Resource
-    private IRunFlowableActinstDao runFlowableActinstDao;
+    private DepartmentService departmentService;
     @Resource
     private IHisFlowableActinstDao hisFlowableActinstDao;
 
@@ -482,9 +484,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         //进入下一个节点
         taskService.complete(task.getId(), variables);
         updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition,deptid);
-        String category = processDefinition.getCategory();
-        Category categoryDto = this.categoryService.getCategory(category);
-        IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
+        Department department = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, deptid));
+        IFormCustomService iFormCustomService = SpringUtils.getBean(department.getServicename());
         FlowModelVO formData = iFormCustomService.getForm(formId);
         List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid());
         Task taskData = null;