查询用户信息去除密码:user.setPassword(null)
This commit is contained in:
@@ -48,7 +48,7 @@ public class MenuController extends BaseController {
|
|||||||
@GetMapping("/page")
|
@GetMapping("/page")
|
||||||
public ApiResult<PageResult<Menu>> page(MenuParam param) {
|
public ApiResult<PageResult<Menu>> page(MenuParam param) {
|
||||||
PageParam<Menu, MenuParam> page = new PageParam<>(param);
|
PageParam<Menu, MenuParam> page = new PageParam<>(param);
|
||||||
page.setDefaultOrder("sort_number");
|
page.setDefaultOrder("sort_number asc, create_time desc");
|
||||||
return success(menuService.page(page, page.getWrapper()));
|
return success(menuService.page(page, page.getWrapper()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ public class MenuController extends BaseController {
|
|||||||
@GetMapping()
|
@GetMapping()
|
||||||
public ApiResult<List<Menu>> list(MenuParam param) {
|
public ApiResult<List<Menu>> list(MenuParam param) {
|
||||||
PageParam<Menu, MenuParam> page = new PageParam<>(param);
|
PageParam<Menu, MenuParam> page = new PageParam<>(param);
|
||||||
page.setDefaultOrder("sort_number");
|
page.setDefaultOrder("sort_number asc, create_time desc");
|
||||||
return success(menuService.list(page.getOrderWrapper()));
|
return success(menuService.list(page.getOrderWrapper()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
<if test="param.tenantId != null">
|
<if test="param.tenantId != null">
|
||||||
AND a.tenant_id = #{param.tenantId}
|
AND a.tenant_id = #{param.tenantId}
|
||||||
</if>
|
</if>
|
||||||
|
ORDER BY a.sort_number, a.create_time DESC
|
||||||
</where>
|
</where>
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|||||||
param.setUserId(userId);
|
param.setUserId(userId);
|
||||||
User user = param.getOne(baseMapper.selectListRel(param));
|
User user = param.getOne(baseMapper.selectListRel(param));
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
|
user.setPassword(null);
|
||||||
user.setRoles(userRoleService.listByUserId(user.getUserId()));
|
user.setRoles(userRoleService.listByUserId(user.getUserId()));
|
||||||
user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
|
user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
|
||||||
// // 系统配置信息
|
// // 系统配置信息
|
||||||
|
|||||||
Reference in New Issue
Block a user