|
|
@@ -11,15 +11,14 @@ import com.aizuda.bpm.engine.core.Execution;
|
|
|
import com.aizuda.bpm.engine.core.FlowCreator;
|
|
|
import com.aizuda.bpm.engine.core.enums.NodeSetType;
|
|
|
import com.aizuda.bpm.engine.core.enums.TaskType;
|
|
|
+import com.aizuda.bpm.engine.entity.FlwInstance;
|
|
|
import com.aizuda.bpm.engine.entity.FlwTaskActor;
|
|
|
import com.aizuda.bpm.engine.model.DynamicAssignee;
|
|
|
import com.aizuda.bpm.engine.model.NodeAssignee;
|
|
|
import com.aizuda.bpm.engine.model.NodeModel;
|
|
|
import com.aizuda.core.api.ApiAssert;
|
|
|
import com.aizuda.service.spring.SpringHelper;
|
|
|
-import com.aizuda.service.web.UserSession;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.apache.ibatis.ognl.NodeType;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.Collections;
|
|
|
@@ -98,7 +97,8 @@ public class FlowTaskActorProvider implements TaskActorProvider {
|
|
|
}
|
|
|
} else if (NodeSetType.initiatorThemselves.eq(nodeModel.getSetType())) {
|
|
|
// 5，发起人自己
|
|
|
- return Collections.singletonList(FlowHelper.getFlwTaskActor());
|
|
|
+ FlwInstance fi = execution.getFlwInstance();
|
|
|
+ return Collections.singletonList(FlwTaskActor.ofUser(fi.getTenantId(), fi.getCreateId(), fi.getCreateBy()));
|
|
|
} else if (NodeSetType.multiLevelSupervisors.eq(nodeModel.getSetType())) {
|
|
|
// 6，连续多级主管
|
|
|
return getDepartmentHeadInfo(flowCreator, nodeModel.getExamineLevel(), true, () -> "未找到任何主管信息");
|
hubin