Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
xy
2025-12-25 20:44:52 +08:00
parent 9ffbdbdf57
commit 6b0bad6047
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java
View File

@@ -19,6 +19,8 @@ public enum AppRoleEnum {
BXS_USER("bxs_user","便携式正式用户"),
ROOT("root","超级管理员"),
OPERATION_MANAGER("operation_manager","运维管理员"),
REGULAR_USER_8000("regular_user_8000","正式用户综合电能质量"),
REGULAR_USER("regular_user","正式用户物联云平台")
;
private final String code;

9
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -490,7 +490,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
List<UserVO> users = new ArrayList<>();
Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode());
Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode());
List<UserRole> userRoles = userRoleMapper.selectUserRole(Stream.of(roleByCode1.getId(),roleByCode2.getId()).collect(Collectors.toList()));
Role roleByCode3 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER_8000.getCode());
Role roleByCode4 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER.getCode());
List<UserRole> userRoles = userRoleMapper.selectUserRole(
Stream.of(roleByCode1.getId()
,roleByCode2.getId()
,roleByCode3.getId()
,roleByCode4.getId()
).collect(Collectors.toList()));
List<String> collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList());
List<User> users1 = this.listByIds(collect);
if (CollectionUtil.isNotEmpty(users1)) {