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

REQ-3288-调整代码

Browse Source
This commit is contained in:
yangqicheng 2024-12-24 17:28:50 +08:00
parent 44b3e2c399
commit b2b772a87e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java
View File

@ -1,8 +1,8 @@
package cn.axzo.workflow.server.controller.delegate;
import cn.axzo.orggateway.api.nodeuser.OrgNodeUserApi;
import cn.axzo.orggateway.api.nodeuser.dto.OrgNodeUserDTO;
import cn.axzo.orggateway.api.nodeuser.req.ListOrgNodeUserReq;
import cn.axzo.orggateway.api.nodeuser.resp.OrganizationalNodeUserDTO;
import cn.axzo.workflow.common.enums.ApproverSpecifyEnum;
import cn.axzo.workflow.common.exception.WorkflowEngineException;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
@ -63,7 +63,7 @@ public class BasedFixedPersonTaskAssigneeSelector extends AbstractBpmnTaskAssign
.filter(StringUtils::hasText)
.map(Long::parseLong)
.collect(Collectors.toList());
List<OrganizationalNodeUserDTO> onlineUsers = new ArrayList<>();
List<OrgNodeUserDTO> onlineUsers = new ArrayList<>();
try {
ListOrgNodeUserReq searchReq = new ListOrgNodeUserReq();
searchReq.setWorkspaceIds(workspaceIds);
@ -80,9 +80,11 @@ public class BasedFixedPersonTaskAssigneeSelector extends AbstractBpmnTaskAssign
}
// 只要有在职的人，不会走审批人为空
if (ListUtils.emptyIfNull(onlineUsers).stream().filter(i -> Objects.equals(i.getIsDelete(), 0L))
.anyMatch(u -> assigners.stream().anyMatch(i -> Objects.equals(i.getPersonId(), String.valueOf(u.getPersonId()))
&& Objects.equals(i.getOuId(), String.valueOf(u.getOrganizationalUnitId()))))) {
if (ListUtils.emptyIfNull(onlineUsers).stream()
.filter(i -> Objects.equals(i.getIsDelete(), 0L))
.anyMatch(u -> assigners.stream()
.anyMatch(i -> Objects.equals(i.getPersonId(), String.valueOf(u.getPersonId()))
&& Objects.equals(i.getOuId(), String.valueOf(u.getOrganizationalUnitId()))))) {
return assigners;
}

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java
View File

@ -2,6 +2,7 @@ package cn.axzo.workflow.server.controller.delegate;
import cn.axzo.orggateway.api.nodeuser.OrgNodeUserApi;
import cn.axzo.orggateway.api.nodeuser.req.FlowTaskAssignerReq;
import cn.axzo.orggateway.api.nodeuser.req.IdentityPair;
import cn.axzo.orggateway.api.nodeuser.resp.FlowTaskAssigner;
import cn.axzo.workflow.common.enums.ApproverSpecifyEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
@ -63,7 +64,7 @@ public class BasedInitiatorLeaderTaskAssigneeSelector extends AbstractBpmnTaskAs
.orgScopes(ListUtils.emptyIfNull(scopeDto.getOrgScopes()).stream()
.map(e -> BeanUtil.copyProperties(e, FlowTaskAssignerReq.OrgScope.class))
.collect(Collectors.toList()))
.sponsor(FlowTaskAssignerReq.IdentityPair.builder()
.sponsor(IdentityPair.builder()
.identityId(Long.valueOf(initiator.getAssignee()))
.identityType(Integer.valueOf(initiator.getAssigneeType())).build())
.build();