|
@@ -16,9 +16,9 @@ import java.util.Objects;
|
|
|
public class FlowTaskAccessStrategy implements TaskAccessStrategy {
|
|
|
|
|
|
@Override
|
|
|
- public boolean isAllowed(String userId, List<FlwTaskActor> taskActors) {
|
|
|
+ public FlwTaskActor isAllowed(String userId, List<FlwTaskActor> taskActors) {
|
|
|
if (null == userId || ObjectUtils.isEmpty(taskActors)) {
|
|
|
- return false;
|
|
|
+ return null;
|
|
|
}
|
|
|
FlwTaskActor flwTaskActor = taskActors.get(0);
|
|
|
if (Objects.equals(flwTaskActor.getActorType(), 1)) {
|
|
@@ -32,13 +32,13 @@ public class FlowTaskAccessStrategy implements TaskAccessStrategy {
|
|
|
}
|
|
|
|
|
|
// 参与者 ID 默认非组,作为用户ID判断是否允许执行
|
|
|
- return taskActors.stream().anyMatch(t -> Objects.equals(t.getActorId(), userId));
|
|
|
+ return taskActors.stream().filter(t -> Objects.equals(t.getActorId(), userId)).findFirst().orElse(null);
|
|
|
}
|
|
|
|
|
|
- private boolean contains(List<FlwTaskActor> taskActors, List<Long> ids) {
|
|
|
+ private FlwTaskActor contains(List<FlwTaskActor> taskActors, List<Long> ids) {
|
|
|
if (CollectionUtils.isEmpty(ids)) {
|
|
|
- return false;
|
|
|
+ return null;
|
|
|
}
|
|
|
- return taskActors.stream().anyMatch(t -> ids.contains(Long.valueOf(t.getActorId())));
|
|
|
+ return taskActors.stream().filter(t -> ids.contains(Long.valueOf(t.getActorId()))).findFirst().orElse(null);
|
|
|
}
|
|
|
}
|