From 75d8d374bc08e489031811a1f736d0b81a8e702e Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Tue, 10 Mar 2026 14:08:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/core/service/UserService.java | 12 ++++++------ .../system/service/impl/SysUserServiceImpl.java | 12 ++++++------ .../org/dromara/workflow/domain/bo/FlowCopyBo.java | 4 ++-- .../org/dromara/workflow/domain/vo/FlowCopyVo.java | 4 ++-- .../workflow/listener/WorkflowGlobalListener.java | 4 ++-- .../workflow/service/impl/FlwTaskServiceImpl.java | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java index eefeef011..204b21412 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java @@ -21,18 +21,18 @@ public interface UserService { String selectUserNameById(Long userId); /** - * 通过用户ID查询用户账户 + * 通过用户ID查询用户昵称 * * @param userId 用户ID - * @return 用户名称 + * @return 用户昵称 */ String selectNicknameById(Long userId); /** - * 通过用户ID查询用户账户 + * 通过用户ID查询用户昵称 * * @param userIds 用户ID 多个用逗号隔开 - * @return 用户名称 + * @return 用户昵称 */ String selectNicknameByIds(String userIds); @@ -93,10 +93,10 @@ public interface UserService { List selectUsersByPostIds(List postIds); /** - * 根据用户 ID 列表查询用户名称映射关系 + * 根据用户 ID 列表查询用户昵称映射关系 * * @param userIds 用户 ID 列表 - * @return Map，其中 key 为用户 ID，value 为对应的用户名称 + * @return Map，其中 key 为用户 ID，value 为对应的用户昵称 */ Map selectUserNamesByIds(List userIds); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index a75e9bbc6..62a3d543a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -599,10 +599,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } /** - * 通过用户ID查询用户账户 + * 通过用户ID查询用户昵称 * * @param userId 用户ID - * @return 用户账户 + * @return 用户昵称 */ @Override @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") @@ -613,10 +613,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } /** - * 通过用户ID查询用户账户 + * 通过用户ID查询用户昵称 * * @param userIds 用户ID 多个用逗号隔开 - * @return 用户账户 + * @return 用户昵称 */ @Override public String selectNicknameByIds(String userIds) { @@ -756,10 +756,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } /** - * 根据用户 ID 列表查询用户名称映射关系 + * 根据用户 ID 列表查询用户昵称映射关系 * * @param userIds 用户 ID 列表 - * @return Map，其中 key 为用户 ID，value 为对应的用户名称 + * @return Map，其中 key 为用户 ID，value 为对应的用户昵称 */ @Override public Map selectUserNamesByIds(List userIds) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java index a45e52109..894174929 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java @@ -23,8 +23,8 @@ public class FlowCopyBo implements Serializable { private Long userId; /** - * 用户名称 + * 用户昵称 */ - private String userName; + private String nickName; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java index 67ef9e2c3..c58071570 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java @@ -24,10 +24,10 @@ public class FlowCopyVo implements Serializable { private Long userId; /** - * 用户名称 + * 用户昵称 */ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "userId") - private String userName; + private String nickName; public FlowCopyVo(Long userId) { this.userId = userId; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index efd24ffd6..c21523f18 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -84,7 +84,7 @@ public class WorkflowGlobalListener implements GlobalListener { FlowCopyBo bo = new FlowCopyBo(); Long id = Convert.toLong(x); bo.setUserId(id); - bo.setUserName(userService.selectUserNameById(id)); + bo.setNickName(userService.selectNicknameById(id)); return bo; }); variable.put(FlowConstant.FLOW_COPY_LIST, list); @@ -159,7 +159,7 @@ public class WorkflowGlobalListener implements GlobalListener { flowTask.setPermissionList(List.of(userIdArray)); // 移除已处理的状态变量 variable.remove(nodeKey); - FlowEngine.insService().removeVariables(flowTask.getInstanceId(),nodeKey); + FlowEngine.insService().removeVariables(flowTask.getInstanceId(), nodeKey); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index acbc9a75c..71170ba6e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -342,7 +342,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { FlowParams flowParams = FlowParams.build() .skipType(SkipType.NONE.getKey()) .hisStatus(TaskStatusEnum.COPY.getStatus()) - .message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getUserName)); + .message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getNickName)); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); hisTask.setCreateTime(updateTime); hisTask.setUpdateTime(updateTime);