From b72e0b5d5edb33e5485a4e9066827cb6700b30fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Sep 2024 11:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8E=BB=E9=99=A4=E5=AF=86=E7=A0=81=EF=BC=9Auser.setP?=
 =?UTF-8?q?assword(null)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/controller/MenuController.java    | 4 ++--
 .../com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml     | 1 +
 .../gxwebsoft/common/system/service/impl/UserServiceImpl.java | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

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<PageResult<Menu>> page(MenuParam 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()));
     }
 
@@ -57,7 +57,7 @@ public class MenuController extends BaseController {
     @GetMapping()
     public ApiResult<List<Menu>> list(MenuParam 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()));
     }
 
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 @@
       <if test="param.tenantId != null">
         AND a.tenant_id = #{param.tenantId}
       </if>
+      ORDER BY a.sort_number, a.create_time DESC
     </where>
   </sql>
 
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<UserMapper, User> 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));
 //      // 系统配置信息