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().eq(Department::getDeptno, deptid)); + IFormCustomService iFormCustomService = SpringUtils.getBean(department.getServicename()); FlowModelVO formData = iFormCustomService.getForm(formId); List taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid()); Task taskData = null;