ruoyi-admin/Dockerfile

@@ -1,6 +1,6 @@
 # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-rocky:17.0.16-cds
-#FROM bellsoft/liberica-openjdk-rocky:21.0.8-cds
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java

@@ -55,14 +55,14 @@ public class TaskAssigneeDTO implements Serializable {
         Function<T, String> storageId,
         Function<T, String> handlerCode,
         Function<T, String> handlerName,
-        Function<T, String> groupName,
+        Function<T, Long> groupName,
         Function<T, Date> createTimeMapper) {
         return sourceList.stream()
             .map(item -> new TaskHandler(
                 storageId.apply(item),
                 handlerCode.apply(item),
                 handlerName.apply(item),
-                groupName.apply(item),
+                groupName != null ? String.valueOf(groupName.apply(item)) : null,
                 createTimeMapper.apply(item)
             )).collect(Collectors.toList());
     }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.*;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -260,13 +260,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         if (s != null) {
             final int len = s.length();
             if (s.length() <= size) {
-                sb.append(Convert.toStr(c).repeat(size - len));
+                sb.append(String.valueOf(c).repeat(size - len));
                 sb.append(s);
             } else {
                 return s.substring(len - size, len);
             }
         } else {
-            sb.append(Convert.toStr(c).repeat(Math.max(0, size)));
+            sb.append(String.valueOf(c).repeat(Math.max(0, size)));
         }
         return sb.toString();
     }

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java

@@ -1,6 +1,5 @@
 package org.dromara.common.excel.core;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -66,7 +65,7 @@ public class DropDownOptions {
         StringBuilder stringBuffer = new StringBuilder();
         String regex = "^[\\S\\d\\u4e00-\\u9fa5]+$";
         for (int i = 0; i < vars.length; i++) {
-            String var = StrUtil.trimToEmpty(Convert.toStr(vars[i]));
+            String var = StrUtil.trimToEmpty(String.valueOf(vars[i]));
             if (!var.matches(regex)) {
                 throw new ServiceException("选项数据不符合规则，仅允许使用中英文字符以及数字");
             }

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java

@@ -1,7 +1,6 @@
 package org.dromara.common.excel.core;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -116,7 +115,7 @@ public class ExcelDownHandler implements SheetWriteHandler {
                 // 否则如果指定了@ExcelEnumFormat，则使用枚举的逻辑
                 ExcelEnumFormat format = field.getDeclaredAnnotation(ExcelEnumFormat.class);
                 List<Object> values = EnumUtil.getFieldValues(format.enumClass(), format.textField());
-                options = StreamUtils.toList(values, Convert::toStr);
+                options = StreamUtils.toList(values, String::valueOf);
             }
             if (ObjectUtil.isNotEmpty(options)) {
                 // 仅当下拉可选项不为空时执行

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java

@@ -129,9 +129,9 @@ public class RedisUtils {
             } catch (Exception e) {
                 long timeToLive = bucket.remainTimeToLive();
                 if (timeToLive == -1) {
-                    bucket.set(value);
+                    setCacheObject(key, value);
                 } else {
-                    bucket.set(value, Duration.ofMillis(timeToLive));
+                    setCacheObject(key, value, Duration.ofMillis(timeToLive));
                 }
             }
         } else {
@@ -147,8 +147,11 @@ public class RedisUtils {
      * @param duration 时间
      */
     public static <T> void setCacheObject(final String key, final T value, final Duration duration) {
-        RBucket<T> bucket = CLIENT.getBucket(key);
-        bucket.set(value, duration);
+        RBatch batch = CLIENT.createBatch();
+        RBucketAsync<T> bucket = batch.getBucket(key);
+        bucket.setAsync(value);
+        bucket.expireAsync(duration);
+        batch.execute();
     }
 
     /**

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java

@@ -1,6 +1,5 @@
 package org.dromara.common.redis.utils;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DatePattern;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -120,7 +119,7 @@ public class SequenceUtils {
      * @return 唯一id
      */
     public static String getNextIdString(String key, Duration expireTime, long initValue, long stepValue) {
-        return Convert.toStr(getNextId(key, expireTime, initValue, stepValue));
+        return String.valueOf(getNextId(key, expireTime, initValue, stepValue));
     }
 
     /**
@@ -131,7 +130,7 @@ public class SequenceUtils {
      * @return 唯一id
      */
     public static String getNextIdString(String key, Duration expireTime) {
-        return Convert.toStr(getNextId(key, expireTime));
+        return String.valueOf(getNextId(key, expireTime));
     }
 
     /**

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java

@@ -1,6 +1,5 @@
 package org.dromara.common.sensitive.core;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.DesensitizedUtil;
 import lombok.AllArgsConstructor;
 
@@ -53,7 +52,7 @@ public enum SensitiveStrategy {
     /**
      * 用户ID
      */
-    USER_ID(s -> Convert.toStr(DesensitizedUtil.userId())),
+    USER_ID(s -> String.valueOf(DesensitizedUtil.userId())),
 
     /**
      * 密码

ruoyi-extend/ruoyi-monitor-admin/Dockerfile

@@ -1,6 +1,6 @@
 # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-rocky:17.0.16-cds
-#FROM bellsoft/liberica-openjdk-rocky:21.0.8-cds
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

ruoyi-extend/ruoyi-snailjob-server/Dockerfile

@@ -1,6 +1,6 @@
 # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-rocky:17.0.16-cds
-#FROM bellsoft/liberica-openjdk-rocky:21.0.8-cds
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java

@@ -1,6 +1,5 @@
 package org.dromara.job.snailjob;
 
-import cn.hutool.core.convert.Convert;
 import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
 import com.aizuda.snailjob.client.job.core.dto.JobArgs;
 import com.aizuda.snailjob.client.model.ExecuteResult;
@@ -18,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class TestStaticShardingJob {
 
     public ExecuteResult jobExecute(JobArgs jobArgs) {
-        String jobParams = Convert.toStr(jobArgs.getJobParams());
+        String jobParams = String.valueOf(jobArgs.getJobParams());
         SnailJobLog.LOCAL.info("开始执行分片任务,参数:{}", jobParams);
         // 获得jobArgs 中传入的开始id和结束id
         String[] split = jobParams.split(",");

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java

@@ -59,7 +59,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysRoleVo> page = roleService.selectPageRoleList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-            item -> Convert.toStr(item.getRoleId()), SysRoleVo::getRoleKey, SysRoleVo::getRoleName, item -> "", SysRoleVo::getCreateTime);
+            item -> String.valueOf(item.getRoleId()), SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -83,7 +83,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysPostVo> page = postService.selectPagePostList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-            item -> Convert.toStr(item.getPostId()), SysPostVo::getPostCategory, SysPostVo::getPostName, item -> Convert.toStr(item.getDeptId()), SysPostVo::getCreateTime);
+            p -> String.valueOf(p.getPostId()), SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getDeptId, SysPostVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -107,7 +107,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysDeptVo> page = deptService.selectPageDeptList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-            item -> Convert.toStr(item.getDeptId()), SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, item -> Convert.toStr(item.getParentId()), SysDeptVo::getCreateTime);
+            d -> String.valueOf(d.getDeptId()), SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, SysDeptVo::getParentId, SysDeptVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -131,7 +131,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
         TableDataInfo<SysUserVo> page = userService.selectPageUserList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-            item -> Convert.toStr(item.getUserId()), SysUserVo::getUserName, SysUserVo::getNickName, item -> Convert.toStr(item.getDeptId()), SysUserVo::getCreateTime);
+            u -> String.valueOf(u.getUserId()), SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getDeptId, SysUserVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java

@@ -3,7 +3,6 @@ package org.dromara.workflow.common.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -111,30 +110,5 @@ public enum TaskAssigneeEnum {
             .map(TaskAssigneeEnum::getCode)
             .collect(Collectors.toList());
     }
-
-    /**
-     * 判断当前办理人类型是否需要调用部门服务（deptService）
-     *
-     * @return 如果类型是 USER、DEPT 或 POST，则返回 true；否则返回 false
-     */
-    public boolean needsDeptService() {
-        return this == USER || this == DEPT || this == POST;
-    }
-
-    /**
-     * 判断给定字符串是否符合 SPEL 表达式格式（以 $ 或 # 开头）
-     *
-     * @param value 待判断字符串
-     * @return 是否为 SPEL 表达式
-     */
-    public static boolean isSpelExpression(String value) {
-        if (value == null) {
-            return false;
-        }
-        // $前缀表示默认办理人变量策略
-        // #前缀表示spel办理人变量策略
-        return StringUtils.startsWith(value, "$") || StringUtils.startsWith(value, "#");
-    }
-
 }
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java

@@ -1,7 +1,6 @@
 package org.dromara.workflow.handler;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.dto.UserDTO;
@@ -60,6 +59,6 @@ public class WorkflowPermissionHandler implements PermissionHandler {
         }
         String storageIds = CollUtil.join(permissions, StringUtils.SEPARATOR);
         List<UserDTO> users = flwTaskAssigneeService.fetchUsersByStorageIds(storageIds);
-        return StreamUtils.toList(users, userDTO -> Convert.toStr(userDTO.getUserId()));
+        return StreamUtils.toList(users, userDTO -> String.valueOf(userDTO.getUserId()));
     }
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.workflow.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -98,11 +97,11 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
         }
         return TreeBuildUtils.buildMultiRoot(
             categoryList,
-            node -> Convert.toStr(node.getCategoryId()),
-            node -> Convert.toStr(node.getParentId()),
+            node -> String.valueOf(node.getCategoryId()),
+            node -> String.valueOf(node.getParentId()),
             (node, treeNode) -> treeNode
-                .setId(Convert.toStr(node.getCategoryId()))
-                .setParentId(Convert.toStr(node.getParentId()))
+                .setId(String.valueOf(node.getCategoryId()))
+                .setParentId(String.valueOf(node.getParentId()))
                 .setName(node.getCategoryName())
                 .setWeight(node.getOrderNum())
         );

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@@ -231,7 +231,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
             flowDefinition.setId(null);
             flowDefinition.setTenantId(tenantId);
             flowDefinition.setIsPublish(0);
-            flowDefinition.setCategory(Convert.toStr(flowCategory.getCategoryId()));
+            flowDefinition.setCategory(String.valueOf(flowCategory.getCategoryId()));
             int insert = flowDefinitionMapper.insert(flowDefinition);
             if (insert <= 0) {
                 log.info("同步流程定义【{}】失败！", definition.getFlowCode());

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java

@@ -110,7 +110,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
      */
     @Override
     public FlowInstanceVo queryByBusinessId(Long businessId) {
-        FlowInstance instance = this.selectInstByBusinessId(Convert.toStr(businessId));
+        FlowInstance instance = this.selectInstByBusinessId(String.valueOf(businessId));
         FlowInstanceVo instanceVo = BeanUtil.toBean(instance, FlowInstanceVo.class);
         Definition definition = defService.getById(instanceVo.getDefinitionId());
         instanceVo.setFlowName(definition.getFlowName());

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java

@@ -162,7 +162,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
         TableDataInfo<FlowSpelVo> page = this.queryPageList(bo, pageQuery);
         // 使用封装的字段映射方法进行转换
         List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
-            FlowSpelVo::getViewSpel, item -> "", FlowSpelVo::getRemark, item -> "", FlowSpelVo::getCreateTime);
+            FlowSpelVo::getViewSpel, c -> "", FlowSpelVo::getRemark, null, FlowSpelVo::getCreateTime);
         return new TaskAssigneeDTO(page.getTotal(), handlers);
     }
 
@@ -182,9 +182,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
                 .select(FlowSpel::getViewSpel, FlowSpel::getRemark)
                 .in(FlowSpel::getViewSpel, viewSpels)
         );
-        return StreamUtils.toMap(list, FlowSpel::getViewSpel, x ->
-            StringUtils.isEmpty(x.getRemark()) ? "" : x.getRemark()
-        );
+        return StreamUtils.toMap(list, FlowSpel::getViewSpel, FlowSpel::getRemark);
     }
 
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Pair;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +14,6 @@ import org.dromara.common.core.domain.model.TaskAssigneeBody;
 import org.dromara.common.core.enums.FormatsType;
 import org.dromara.common.core.service.*;
 import org.dromara.common.core.utils.DateUtils;
-import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.warm.flow.ui.dto.HandlerFunDto;
 import org.dromara.warm.flow.ui.dto.HandlerQuery;
@@ -30,7 +28,6 @@ import org.dromara.workflow.service.IFlwTaskAssigneeService;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 流程设计器-获取办理人权限设置列表
@@ -93,25 +90,31 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
             return Collections.emptyList();
         }
         // 解析并归类 ID，同时记录原始顺序和对应解析结果
-        Map<TaskAssigneeEnum, List<String>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
-        Map<String, Pair<TaskAssigneeEnum, String>> parsedMap = new LinkedHashMap<>();
+        Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
+        Map<String, Pair<TaskAssigneeEnum, Long>> parsedMap = new LinkedHashMap<>();
+        List<String> spelList = new ArrayList<>();
         for (String storageId : storageIds) {
-            Pair<TaskAssigneeEnum, String> parsed = this.parseStorageId(storageId);
+            Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
             parsedMap.put(storageId, parsed);
             if (parsed != null) {
                 typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue());
+            } else if (StringUtils.startsWith(storageId, "$") || StringUtils.startsWith(storageId, "#")) {
+                // $前缀表示默认办理人变量策略
+                // #前缀表示spel办理人变量策略
+                spelList.add(storageId);
             }
         }
 
         // 查询所有类型对应的 ID 名称映射
-        Map<TaskAssigneeEnum, Map<String, String>> nameMap = new EnumMap<>(TaskAssigneeEnum.class);
+        Map<TaskAssigneeEnum, Map<Long, String>> nameMap = new EnumMap<>(TaskAssigneeEnum.class);
         typeIdMap.forEach((type, ids) -> nameMap.put(type, this.getNamesByType(type, ids)));
+        Map<String, String> spelMap = spelService.selectRemarksBySpels(spelList);
         // 组装返回结果，保持原始顺序
         return parsedMap.entrySet().stream()
             .map(entry -> {
                 String storageId = entry.getKey();
-                Pair<TaskAssigneeEnum, String> parsed = entry.getValue();
-                String handlerName = (parsed == null) ? null
+                Pair<TaskAssigneeEnum, Long> parsed = entry.getValue();
+                String handlerName = (parsed == null) ? spelMap.get(storageId)
                     : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap())
                     .get(parsed.getValue());
                 return new HandlerFeedBackVo(storageId, handlerName);
@@ -135,37 +138,20 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
      * 根据任务办理类型获取部门数据
      */
     private List<DeptDTO> fetchDeptData(TaskAssigneeEnum type) {
-        if (type.needsDeptService()) {
+        if (type == TaskAssigneeEnum.USER || type == TaskAssigneeEnum.DEPT || type == TaskAssigneeEnum.POST) {
             return deptService.selectDeptsByList();
         }
         return new ArrayList<>();
     }
 
-    /**
-     * 获取权限分组名称
-     *
-     * @param type      任务分配人枚举
-     * @param groupName 权限分组
-     * @return 权限分组名称
-     */
-    private String getGroupName(TaskAssigneeEnum type, String groupName) {
-        if (StringUtils.isEmpty(groupName)) {
-            return DEFAULT_GROUP_NAME;
-        }
-        if (type.needsDeptService()) {
-            return deptService.selectDeptNameByIds(groupName);
-        }
-        return DEFAULT_GROUP_NAME;
-    }
-
     /**
      * 构建部门树状结构
      */
     private TreeFunDto<DeptDTO> buildDeptTree(List<DeptDTO> depts) {
         return new TreeFunDto<>(depts)
-            .setId(dept -> Convert.toStr(dept.getDeptId()))
+            .setId(dept -> String.valueOf(dept.getDeptId()))
             .setName(DeptDTO::getDeptName)
-            .setParentId(dept -> Convert.toStr(dept.getParentId()));
+            .setParentId(dept -> String.valueOf(dept.getParentId()));
     }
 
     /**
@@ -176,7 +162,10 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
             .setStorageId(assignee -> type.getCode() + assignee.getStorageId())
             .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无"))
             .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无"))
-            .setGroupName(assignee -> this.getGroupName(type, assignee.getGroupName()))
+            .setGroupName(assignee -> StringUtils.defaultIfBlank(
+                Optional.ofNullable(assignee.getGroupName())
+                    .map(deptService::selectDeptNameByIds)
+                    .orElse(DEFAULT_GROUP_NAME), DEFAULT_GROUP_NAME))
             .setCreateTime(assignee -> DateUtils.parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, assignee.getCreateTime()));
     }
 
@@ -193,9 +182,9 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
         if (StringUtils.isEmpty(storageIds)) {
             return List.of();
         }
-        Map<TaskAssigneeEnum, List<String>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
+        Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
         for (String storageId : storageIds.split(StringUtils.SEPARATOR)) {
-            Pair<TaskAssigneeEnum, String> parsed = this.parseStorageId(storageId);
+            Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
             if (parsed != null) {
                 typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue());
             }
@@ -216,17 +205,13 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
      * 如果类型为部门（DEPT），则通过部门ID列表查询；
      * 如果类型为岗位（POST）或无法识别的类型，则返回空列表
      */
-    private List<UserDTO> getUsersByType(TaskAssigneeEnum type, List<String> ids) {
-        if (type == TaskAssigneeEnum.SPEL) {
-            return new ArrayList<>();
-        }
-        List<Long> longIds = StreamUtils.toList(ids, Convert::toLong);
+    private List<UserDTO> getUsersByType(TaskAssigneeEnum type, List<Long> ids) {
         return switch (type) {
-            case USER -> userService.selectListByIds(longIds);
-            case ROLE -> userService.selectUsersByRoleIds(longIds);
-            case DEPT -> userService.selectUsersByDeptIds(longIds);
-            case POST -> userService.selectUsersByPostIds(longIds);
-            default -> new ArrayList<>();
+            case USER -> userService.selectListByIds(ids);
+            case ROLE -> userService.selectUsersByRoleIds(ids);
+            case DEPT -> userService.selectUsersByDeptIds(ids);
+            case POST -> userService.selectUsersByPostIds(ids);
+            case SPEL -> new ArrayList<>();
         };
     }
 
@@ -237,28 +222,14 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
      * @param ids  ID 列表（如用户ID、角色ID等）
      * @return 返回 Map，其中 key 为 ID，value 为对应的名称
      */
-    private Map<String, String> getNamesByType(TaskAssigneeEnum type, List<String> ids) {
-        if (type == TaskAssigneeEnum.SPEL) {
-            return spelService.selectRemarksBySpels(ids);
-        }
-
-        List<Long> longIds = StreamUtils.toList(ids, Convert::toLong);
-        Map<Long, String> rawMap = switch (type) {
-            case USER -> userService.selectUserNamesByIds(longIds);
-            case ROLE -> roleService.selectRoleNamesByIds(longIds);
-            case DEPT -> deptService.selectDeptNamesByIds(longIds);
-            case POST -> postService.selectPostNamesByIds(longIds);
-            default -> Collections.emptyMap();
+    private Map<Long, String> getNamesByType(TaskAssigneeEnum type, List<Long> ids) {
+        return switch (type) {
+            case USER -> userService.selectUserNamesByIds(ids);
+            case ROLE -> roleService.selectRoleNamesByIds(ids);
+            case DEPT -> deptService.selectDeptNamesByIds(ids);
+            case POST -> postService.selectPostNamesByIds(ids);
+            case SPEL -> new HashMap<>();
         };
-        if (MapUtil.isEmpty(rawMap)) {
-            return Collections.emptyMap();
-        }
-        return rawMap.entrySet()
-            .stream()
-            .collect(Collectors.toMap(
-                e -> Convert.toStr(e.getKey()),
-                Map.Entry::getValue
-            ));
     }
 
     /**
@@ -267,20 +238,24 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
      * @param storageId 例如 "user:123" 或 "456"
      * @return Pair(TaskAssigneeEnum, Long)，如果格式非法返回 null
      */
-    private Pair<TaskAssigneeEnum, String> parseStorageId(String storageId) {
+    private Pair<TaskAssigneeEnum, Long> parseStorageId(String storageId) {
         if (StringUtils.isBlank(storageId)) {
             return null;
         }
-        if (TaskAssigneeEnum.isSpelExpression(storageId)) {
-            return Pair.of(TaskAssigneeEnum.SPEL, storageId);
+        // 跳过以 $ 或 # 开头的字符串
+        if (StringUtils.startsWith(storageId, "$") || StringUtils.startsWith(storageId, "#")) {
+            // $前缀表示默认办理人变量策略
+            // #前缀表示spel办理人变量策略
+            log.debug("跳过 storageId 解析，检测到内置变量表达式：{}", storageId);
+            return null;
         }
         try {
             String[] parts = storageId.split(StrUtil.COLON, 2);
             if (parts.length < 2) {
-                return Pair.of(TaskAssigneeEnum.USER, parts[0]);
+                return Pair.of(TaskAssigneeEnum.USER, Convert.toLong(parts[0]));
             } else {
                 TaskAssigneeEnum type = TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON);
-                return Pair.of(type, parts[1]);
+                return Pair.of(type, Convert.toLong(parts[1]));
             }
         } catch (Exception e) {
             log.warn("解析 storageId 失败，格式非法：{}，错误信息：{}", storageId, e.getMessage());

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -303,7 +303,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
         List<User> userList = StreamUtils.toList(flowCopyList, x ->
             new FlowUser()
                 .setType(TaskAssigneeType.COPY.getCode())
-                .setProcessedBy(Convert.toStr(x.getUserId()))
+                .setProcessedBy(String.valueOf(x.getUserId()))
                 .setAssociated(taskId));
         // 批量保存抄送人员
         FlowEngine.userService().saveBatch(userList);
@@ -589,7 +589,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
                 if (ObjectUtil.isNotNull(first) && CollUtil.isNotEmpty(first.getPermissionList())) {
                     List<UserDTO> users = flwTaskAssigneeService.fetchUsersByStorageIds(String.join(StringUtils.SEPARATOR, first.getPermissionList()));
                     if (CollUtil.isNotEmpty(users)) {
-                        flowNode.setPermissionFlag(StreamUtils.join(users, e -> Convert.toStr(e.getUserId())));
+                        flowNode.setPermissionFlag(StreamUtils.join(users, e -> String.valueOf(e.getUserId())));
                     }
                 }