用户列表展示调整

This commit is contained in:
2023-08-29 14:22:22 +08:00
parent d34425f94a
commit 5335217fc9

View File

@@ -278,12 +278,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
public Page<UserVO> userList(UserParam.UserQueryParam queryParam) {
QueryWrapper<UserVO> queryWrapper = new QueryWrapper<>();
Page<UserVO> page = new Page<>();
Integer type = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one().getType();
User user = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one();
Integer type = user.getType();
if (Objects.equals(UserType.SUPER_ADMINISTRATOR, type)) {
type = UserType.ADMINISTRATOR;
} else if (Objects.equals(UserType.ADMINISTRATOR, type)) {
//fixme 存在web用户和App用户目前先通过管理员的登录名来区分开
} else if (Objects.equals(UserType.ADMINISTRATOR, type) && !Objects.equals(user.getLoginName(),"njcnyw")) {
type = UserType.USER;
} else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
} else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(),"njcnyw")) {
type = UserType.APP;
}
else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
return page;
}
if (ObjectUtil.isNotNull(queryParam)) {