From cb7be09dc82cdc3deed507a7ae3685e81f46e814 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
index 0422a79..082ceb8 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -1,7 +1,6 @@
package com.xiaopeng.account.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -159,23 +158,20 @@
}
// 8. 查询角色信息
- List<XpOperationsRole> xpOperationsRoles = xpOperationsRoleMapper
- .selectList(new LambdaQueryWrapper<XpOperationsRole>().eq(XpOperationsRole::getOperationsUserId, userId));
- if (CollUtil.isNotEmpty(xpOperationsRoles)) {
- List<Long> roleIds = xpOperationsRoles.stream().map(XpOperationsRole::getRoleId).collect(Collectors.toList());
- List<SysRole> sysRoles = sysRoleMapper.selectList(Wrappers.lambdaQuery(SysRole.class)
- .in(SysRole::getId, roleIds));
- List<XpOperationsUserProfileVO.RoleInfoVO> roleVOs = sysRoles.stream()
- .filter(r -> r.getId() != null)
+ List<XpOperationsUserWithRoleVO> userWithRoles = xpOperationsRoleMapper.selectUsersWithRoleByIds(Collections.singletonList(userId));
+ if (!CollectionUtils.isEmpty(userWithRoles)) {
+ List<XpOperationsUserProfileVO.RoleInfoVO> roleVOs = userWithRoles.stream()
+ .filter(r -> r.getRoleId() != null)
.map(r -> {
XpOperationsUserProfileVO.RoleInfoVO roleVO = new XpOperationsUserProfileVO.RoleInfoVO();
- roleVO.setRoleId(r.getId());
+ roleVO.setRoleId(r.getRoleId());
roleVO.setRoleName(r.getRoleName());
return roleVO;
})
.collect(Collectors.toList());
vo.setRoles(roleVOs);
}
+
return vo;
}
@@ -187,7 +183,6 @@
//保存审核记录
XpQualificationAudit xpQualificationAudit = BeanUtil.copyProperties(dto, XpQualificationAudit.class, "id");
xpQualificationAudit.setAuditStatus(1);
- xpQualificationAudit.setOperationsUserId(dto.getId());
xpQualificationAuditService.save(xpQualificationAudit);
}
--
Gitblit v1.7.1