From d63375c2a3685b3584dc641310fd86b2bf4fa4c4 Mon Sep 17 00:00:00 2001
From: warm <290631660@qq.com>
Date: Wed, 14 May 2025 15:56:03 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=B2=E5=8A=9E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E4=BA=BA=E6=AD=A3=E7=A1=AE=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/controller/ExecuteController.java     | 18 ++++++++++++------
 .../flow/service/impl/ExecuteServiceImpl.java  |  4 +---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-flow/src/main/java/com/ruoyi/flow/controller/ExecuteController.java b/ruoyi-flow/src/main/java/com/ruoyi/flow/controller/ExecuteController.java
index 35f1c3be..c61dbfc7 100644
--- a/ruoyi-flow/src/main/java/com/ruoyi/flow/controller/ExecuteController.java
+++ b/ruoyi-flow/src/main/java/com/ruoyi/flow/controller/ExecuteController.java
@@ -15,8 +15,8 @@ import com.ruoyi.flow.vo.WarmFlowInteractiveTypeVo;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.service.ISysRoleService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.dromara.warm.flow.core.entity.*;
 import org.dromara.warm.flow.core.enums.CooperateType;
 import org.dromara.warm.flow.core.enums.UserType;
@@ -101,19 +101,25 @@ public class ExecuteController extends BaseController {
                                 taskVo.setApprover("");
                             }
                             String name = getName(user.getProcessedBy());
-                            if (StringUtils.isNotEmpty(name)) taskVo.setApprover(taskVo.getApprover().concat(name).concat(";"));
+                            if (StringUtils.isNotEmpty(name)) {
+                                taskVo.setApprover(taskVo.getApprover().concat(name).concat(";"));
+                            }
                         } else if (UserType.TRANSFER.getKey().equals(user.getType())) {
                             if (StringUtils.isEmpty(taskVo.getTransferredBy())) {
                                 taskVo.setTransferredBy("");
                             }
                             String name = getName(user.getProcessedBy());
-                            if (StringUtils.isNotEmpty(name)) taskVo.setTransferredBy(taskVo.getTransferredBy().concat(name).concat(";"));
+                            if (StringUtils.isNotEmpty(name)) {
+                                taskVo.setTransferredBy(taskVo.getTransferredBy().concat(name).concat(";"));
+                            }
                         } else if (UserType.DEPUTE.getKey().equals(user.getType())) {
                             if (StringUtils.isEmpty(taskVo.getDelegate())) {
                                 taskVo.setDelegate("");
                             }
                             String name = getName(user.getProcessedBy());
-                            if (StringUtils.isNotEmpty(name)) taskVo.setDelegate(taskVo.getDelegate().concat(name).concat(";"));
+                            if (StringUtils.isNotEmpty(name)) {
+                                taskVo.setDelegate(taskVo.getDelegate().concat(name).concat(";"));
+                            }
                         }
                     }
                 }
@@ -156,7 +162,7 @@ public class ExecuteController extends BaseController {
                 }
                 if (StringUtils.isNotEmpty(hisTask.getCollaborator())) {
                     String[] split = hisTask.getCollaborator().split(",");
-                    if (split.length > 1) {
+                    if (ArrayUtils.isNotEmpty(split)) {
                         List<String> names = new ArrayList<>();
                         for (String s : split) {
                             names.add(userMap.get(Long.valueOf(s)));
@@ -227,7 +233,7 @@ public class ExecuteController extends BaseController {
                 }
                 if (StringUtils.isNotEmpty(hisTask.getCollaborator())) {
                     String[] split = hisTask.getCollaborator().split(",");
-                    if (split.length > 1) {
+                    if (ArrayUtils.isNotEmpty(split)) {
                         List<String> names = new ArrayList<>();
                         for (String s : split) {
                             names.add(userMap.get(Long.valueOf(s)));
diff --git a/ruoyi-flow/src/main/java/com/ruoyi/flow/service/impl/ExecuteServiceImpl.java b/ruoyi-flow/src/main/java/com/ruoyi/flow/service/impl/ExecuteServiceImpl.java
index 8497564e..4d148270 100644
--- a/ruoyi-flow/src/main/java/com/ruoyi/flow/service/impl/ExecuteServiceImpl.java
+++ b/ruoyi-flow/src/main/java/com/ruoyi/flow/service/impl/ExecuteServiceImpl.java
@@ -1,11 +1,10 @@
 package com.ruoyi.flow.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.flow.vo.WarmFlowInteractiveTypeVo;
 import com.ruoyi.flow.mapper.WarmFlowMapper;
 import com.ruoyi.flow.service.ExecuteService;
 import com.ruoyi.flow.vo.FlowTaskVo;
+import com.ruoyi.flow.vo.WarmFlowInteractiveTypeVo;
 import org.dromara.warm.flow.core.entity.HisTask;
 import org.dromara.warm.flow.core.entity.Task;
 import org.dromara.warm.flow.orm.entity.FlowHisTask;
@@ -65,7 +64,6 @@ public class ExecuteServiceImpl implements ExecuteService {
      * @param warmFlowInteractiveTypeVo 输入用户编号集合
      * @return 用户列表
      */
-    @DataScope(deptAlias = "d", userAlias = "u")
     @Override
     public List<SysUser> selectNotUserList(WarmFlowInteractiveTypeVo warmFlowInteractiveTypeVo) {
         return flowMapper.selectNotUserIds(warmFlowInteractiveTypeVo);
-- 
Gitee