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

update - 调整任务审批人比对逻辑

Browse Source
This commit is contained in:
wangli 2024-03-02 09:42:20 +08:00
parent 5df64e117a
commit 329c4dc63f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
View File

@ -104,10 +104,17 @@ public class CustomTaskHelper {
// throw new WorkflowEngineException(TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF);
// }
if (Objects.nonNull(originTaskAssigner) && StringUtils.hasLength(taskEntity.getAssignee())
&& (!taskEntity.getAssignee().contains(originTaskAssigner.buildAssigneeId())
&& !taskEntity.getAssignee().contains(originTaskAssigner.buildAssigneeId_1_2_1()))) {
throw new WorkflowEngineException(TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF);
// FIXME by wangli: 在 2183 需求上线前, 因为团队 ID 和班组 ID 的问题,再次调整任务审批人的比对逻辑
// if (Objects.nonNull(originTaskAssigner) && StringUtils.hasLength(taskEntity.getAssignee())
// && (!taskEntity.getAssignee().contains(originTaskAssigner.buildAssigneeId())
// && !taskEntity.getAssignee().contains(originTaskAssigner.buildAssigneeId_1_2_1()))) {
// throw new WorkflowEngineException(TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF);
// }
if (Objects.nonNull(originTaskAssigner) && StringUtils.hasLength(taskEntity.getAssignee())) {
String[] split = taskEntity.getAssignee().split("\\|");
if (!Objects.equals(split[1], originTaskAssigner.getPersonId())) {
throw new WorkflowEngineException(TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF);
}
}
}