From 4a2f9955842216b09476f4a40d110c989d7b5f2e Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 3 Feb 2026 20:34:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:userinfo=E8=BF=94=E5=9B=9E=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MessageArgsServiceImpl.java | 78 +++++++++---------- .../honeycom/user/vo/SysUserInfoVO.java | 6 ++ .../user/service/impl/SysUserServiceImpl.java | 3 + 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/honeycom-msg/honeycom-msg-biz/src/main/java/com/honeycombis/honeycom/msg/service/impl/MessageArgsServiceImpl.java b/honeycom-msg/honeycom-msg-biz/src/main/java/com/honeycombis/honeycom/msg/service/impl/MessageArgsServiceImpl.java index fd0616b..d7479c4 100644 --- a/honeycom-msg/honeycom-msg-biz/src/main/java/com/honeycombis/honeycom/msg/service/impl/MessageArgsServiceImpl.java +++ b/honeycom-msg/honeycom-msg-biz/src/main/java/com/honeycombis/honeycom/msg/service/impl/MessageArgsServiceImpl.java @@ -8,11 +8,11 @@ import com.honeycombis.honeycom.msg.api.constant.MessageArgsEnum; import com.honeycombis.honeycom.msg.api.dto.MessageParameterDTO; import com.honeycombis.honeycom.msg.api.vo.MessageArgsVo; import com.honeycombis.honeycom.msg.service.MessageArgsService; -import com.honeycombis.honeycom.pm.entity.PmMilestoneEntity; -import com.honeycombis.honeycom.pm.entity.PmProjectEntity; -import com.honeycombis.honeycom.pm.entity.PmTaskEntity; -import com.honeycombis.honeycom.pm.feign.HoneycomPmTaskServiceFeign; -import com.honeycombis.honeycom.pm.vo.PmTaskToMsgVo; +//import com.honeycombis.honeycom.pm.entity.PmMilestoneEntity; +//import com.honeycombis.honeycom.pm.entity.PmProjectEntity; +//import com.honeycombis.honeycom.pm.entity.PmTaskEntity; +//import com.honeycombis.honeycom.pm.feign.HoneycomPmTaskServiceFeign; +//import com.honeycombis.honeycom.pm.vo.PmTaskToMsgVo; import com.honeycombis.honeycom.tenant.entity.SysDeptEntity; import com.honeycombis.honeycom.tenant.feign.HoneycomTenantServiceFeign; import com.honeycombis.honeycom.tenant.vo.SysStaffDetailVO; @@ -33,7 +33,7 @@ import java.util.Objects; @RequiredArgsConstructor public class MessageArgsServiceImpl implements MessageArgsService { - private final HoneycomPmTaskServiceFeign honeycomPmTaskServiceFeign; +// private final HoneycomPmTaskServiceFeign honeycomPmTaskServiceFeign; private final HoneycomTenantServiceFeign honeycomTenantServiceFeign; private final HoneycomUserServiceFeign honeycomUserServiceFeign; @@ -70,39 +70,39 @@ public class MessageArgsServiceImpl implements MessageArgsService { */ @Override public String getValue4Args(String businessArgsJson, Long tenantId, MessageArgsEnum args, Long userId) { - if (StringUtils.isBlank(businessArgsJson)) { - // json值为空则返回空串 - return ""; - } - JSONObject jsonObject = JSONObject.parseObject(businessArgsJson); - String argsValue = jsonObject.getString(args.getBusinessArgName()); - if (StrUtil.isBlank(argsValue)) { - // 获取的属性值为空返回空串 - return ""; - } - if (args.getDataSource() == 0) { - // 根据项目ID获取项目信息 - R result = honeycomPmTaskServiceFeign.getMsgProjectArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } else if (args.getDataSource() == 1) { - // 根据任务ID获取任务信息 - R result = honeycomPmTaskServiceFeign.getMsgTaskArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } else if (args.getDataSource() == 2) { - // 根据里程碑ID获取里程碑信息 - R result = honeycomPmTaskServiceFeign.getMsgMilestoneArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } else if (args.getDataSource() == 3) { - // 根据租户ID获取租户信息 - R result = honeycomTenantServiceFeign.getTenantView(tenantId, SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } else if (args.getDataSource() == 4) { - R result = honeycomTenantServiceFeign.getById(Long.valueOf(argsValue), SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } else if (args.getDataSource() == 5) { - R result = honeycomTenantServiceFeign.getDeptById(Long.valueOf(argsValue), SecurityConstants.FROM_IN); - return getObjectValue(result, args.getApiFieldName()); - } +// if (StringUtils.isBlank(businessArgsJson)) { +// // json值为空则返回空串 +// return ""; +// } +// JSONObject jsonObject = JSONObject.parseObject(businessArgsJson); +// String argsValue = jsonObject.getString(args.getBusinessArgName()); +// if (StrUtil.isBlank(argsValue)) { +// // 获取的属性值为空返回空串 +// return ""; +// } +// if (args.getDataSource() == 0) { +// // 根据项目ID获取项目信息 +// R result = honeycomPmTaskServiceFeign.getMsgProjectArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } else if (args.getDataSource() == 1) { +// // 根据任务ID获取任务信息 +// R result = honeycomPmTaskServiceFeign.getMsgTaskArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } else if (args.getDataSource() == 2) { +// // 根据里程碑ID获取里程碑信息 +// R result = honeycomPmTaskServiceFeign.getMsgMilestoneArgs(Long.valueOf(argsValue), SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } else if (args.getDataSource() == 3) { +// // 根据租户ID获取租户信息 +// R result = honeycomTenantServiceFeign.getTenantView(tenantId, SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } else if (args.getDataSource() == 4) { +// R result = honeycomTenantServiceFeign.getById(Long.valueOf(argsValue), SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } else if (args.getDataSource() == 5) { +// R result = honeycomTenantServiceFeign.getDeptById(Long.valueOf(argsValue), SecurityConstants.FROM_IN); +// return getObjectValue(result, args.getApiFieldName()); +// } return ""; } diff --git a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserInfoVO.java b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserInfoVO.java index 21bc93e..abf48ca 100644 --- a/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserInfoVO.java +++ b/honeycom-user/honeycom-user-api/src/main/java/com/honeycombis/honeycom/user/vo/SysUserInfoVO.java @@ -32,4 +32,10 @@ public class SysUserInfoVO implements Serializable { @Schema(description = "角色标识集合") private List roles = new ArrayList<>(); + /** + * 角色编码集合 + */ + @Schema(description = "角色编码集合") + private List roleCodes = new ArrayList<>(); + } diff --git a/honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysUserServiceImpl.java b/honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysUserServiceImpl.java index 3c8957a..d543345 100644 --- a/honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysUserServiceImpl.java +++ b/honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysUserServiceImpl.java @@ -829,6 +829,9 @@ public class SysUserServiceImpl extends ServiceImpl roleIds = sysRoleList.stream().map(SysRoleVO::getRoleId).collect(Collectors.toList()); result.setRoles(roleIds); + List roleCodes = sysRoleList.stream().map(SysRoleVO::getRoleCode).collect(Collectors.toList()); + result.setRoleCodes(roleCodes); + // 获取功能编码相关 R> functionCodeReturn = honeycomTenantServiceFeign.findFunctionCodesByRoleId(userInfo.getUserId(), String.valueOf(loginDefaultStaff.getTenantId()), SecurityConstants.FROM_IN); if (Objects.isNull(functionCodeReturn) || !functionCodeReturn.isOk()) {