diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java index a9c496b..1a09b01 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java @@ -48,7 +48,7 @@ public class MenuController extends BaseController { @GetMapping("/page") public ApiResult> page(MenuParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); + page.setDefaultOrder("sort_number asc, create_time desc"); return success(menuService.page(page, page.getWrapper())); } @@ -57,7 +57,7 @@ public class MenuController extends BaseController { @GetMapping() public ApiResult> list(MenuParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); + page.setDefaultOrder("sort_number asc, create_time desc"); return success(menuService.list(page.getOrderWrapper())); } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml index 89c7c6e..ad1676a 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml @@ -25,6 +25,7 @@ AND a.tenant_id = #{param.tenantId} + ORDER BY a.sort_number, a.create_time DESC diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java index 0966ee7..372fe91 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -83,6 +83,7 @@ public class UserServiceImpl extends ServiceImpl implements Us param.setUserId(userId); User user = param.getOne(baseMapper.selectListRel(param)); if (user != null) { + user.setPassword(null); user.setRoles(userRoleService.listByUserId(user.getUserId())); user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null)); // // 系统配置信息