wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2924) - 完善离职的判断逻辑

Browse Source
This commit is contained in:
wangli 2024-09-24 21:06:19 +08:00
parent c80f57a0fe
commit 1c5acfd728
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java
View File

@ -12,6 +12,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.FlowElement;
@ -84,7 +85,11 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne
} }
ListFlowTaskAssignerReq req = builder.workspaceAdmin(false).build(); ListFlowTaskAssignerReq req = builder.workspaceAdmin(false).build();
req.setProcInstId(execution.getProcessInstanceId()); req.setProcInstId(execution.getProcessInstanceId());
req.setCooperateTypes(getCooperationTypes(flowElement)); if(Objects.equals(ApproverScopeEnum.entWorkspace, approverScope.get()) && Objects.equals(ApproverSpecifyEnum.fixedPerson,optSpecify.get())) {
req.setCooperateTypes(Sets.newHashSet(1,2,3,4,5,6,7,8,9,11,30));
} else {
req.setCooperateTypes(getCooperationTypes(flowElement));
}
// 发起人主管找其超管时，需要将发起人的数据包装进 orgScope // 发起人主管找其超管时，需要将发起人的数据包装进 orgScope
if (Objects.equals(ApproverSpecifyEnum.initiatorLeader, optSpecify.get())) { if (Objects.equals(ApproverSpecifyEnum.initiatorLeader, optSpecify.get())) {
BpmnTaskDelegateAssigner initiator = BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariable(INTERNAL_INITIATOR, String.class)); BpmnTaskDelegateAssigner initiator = BpmnTaskDelegateAssigner.toObjectCompatible(execution.getVariable(INTERNAL_INITIATOR, String.class));