瀏覽代碼

升级 flowlong 0.0.10 版本

hubin 11 月之前
父節點
當前提交
d4ba38b845
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 1 1
      build.gradle
  2. 1 1
      pom.xml
  3. 6 6
      src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskAccessStrategy.java

+ 1 - 1
build.gradle

@@ -31,7 +31,7 @@ buildscript {
     ext {
         springBootVersion = "3.1.1"
         springdocVersion = "2.5.0"
-        flowlongVersion = "0.0.9"
+        flowlongVersion = "0.0.10"
         aizudaVersion = "1.0.3"
     }
 

+ 1 - 1
pom.xml

@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>com.aizuda</groupId>
 			<artifactId>flowlong-spring-boot-starter</artifactId>
-			<version>0.0.9</version>
+			<version>0.0.10</version>
 		</dependency>
 
 		<!-- 服务监听 -->

+ 6 - 6
src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskAccessStrategy.java

@@ -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);
     }
 }