From 40244fbfac058e4164bad9c80c94f8d2f6aec7cf Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Tue, 28 Dec 2021 22:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF.=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hippo4j/auth/service/impl/UserServiceImpl.java | 7 +++++-- .../cn/hippo4j/console/controller/UserController.java | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java index c29db6a9..d8f5b0fc 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java @@ -3,16 +3,17 @@ package cn.hippo4j.auth.service.impl; import cn.hippo4j.auth.mapper.UserMapper; import cn.hippo4j.auth.model.UserInfo; import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO; +import cn.hippo4j.auth.model.biz.user.UserReqDTO; import cn.hippo4j.auth.model.biz.user.UserRespDTO; import cn.hippo4j.auth.service.RoleService; import cn.hippo4j.auth.service.UserService; +import cn.hippo4j.common.toolkit.StringUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import cn.hippo4j.auth.model.biz.user.UserReqDTO; import lombok.AllArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; @@ -38,7 +39,9 @@ public class UserServiceImpl implements UserService { @Override public IPage listUser(UserQueryPageReqDTO reqDTO) { - IPage selectPage = userMapper.selectPage(reqDTO, null); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class) + .eq(StringUtil.isNotBlank(reqDTO.getUserName()), UserInfo::getUserName, reqDTO.getUserName()); + IPage selectPage = userMapper.selectPage(reqDTO, queryWrapper); return selectPage.convert(each -> BeanUtil.toBean(each, UserRespDTO.class)); } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java index e7f2bc67..e87d98e8 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java @@ -8,7 +8,6 @@ import cn.hippo4j.auth.security.AuthManager; import cn.hippo4j.auth.service.UserService; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.model.TokenInfo; -import cn.hippo4j.common.toolkit.UserContext; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,10 +46,9 @@ public class UserController { return Results.success(resultUserPage); } - @GetMapping("/info") - public Result userInfo() { - String userName = UserContext.getUserName(); - IPage listUser = userService.listUser(new UserQueryPageReqDTO().setUserName(userName)); + @GetMapping("/info/{username}") + public Result userInfo(@PathVariable("username") String username) { + IPage listUser = userService.listUser(new UserQueryPageReqDTO().setUserName(username)); UserRespDTO userRespDTO = listUser.getRecords().get(0); return Results.success(userRespDTO); }