From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategy.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategy.java
similarity index 78%
rename from iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
rename to iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategy.java
index 51836b3..e2b7521 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategy.java
@@ -1,19 +1,19 @@
-package com.iailab.module.bpm.framework.flowable.core.candidate.strategy;
+package com.iailab.module.bpm.framework.flowable.core.candidate.strategy.user;
+import cn.hutool.core.text.StrPool;
import com.iailab.framework.common.util.string.StrUtils;
import com.iailab.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
import com.iailab.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
import com.iailab.module.system.api.user.AdminUserApi;
-import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.Set;
+import java.util.LinkedHashSet;
/**
* 用户 {@link BpmTaskCandidateStrategy} 实现类
*
- * @author kyle
+ * @author hou
*/
@Component
public class BpmTaskCandidateUserStrategy implements BpmTaskCandidateStrategy {
@@ -28,12 +28,12 @@
@Override
public void validateParam(String param) {
- adminUserApi.validateUserList(StrUtils.splitToLongSet(param));
+ adminUserApi.validateUserList(StrUtils.splitToLongSet(param)).checkError();
}
@Override
- public Set<Long> calculateUsers(DelegateExecution execution, String param) {
- return StrUtils.splitToLongSet(param);
+ public LinkedHashSet<Long> calculateUsers(String param) {
+ return new LinkedHashSet<>(StrUtils.splitToLong(param, StrPool.COMMA));
}
}
\ No newline at end of file
--
Gitblit v1.9.3