From 3bf0f301888db2f045f477f23717b7748a7c0504 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 19 Jan 2026 11:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=81=E4=B8=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/persistence/repository/impl/UserRepositoryImpl.java | 2 +- web-infrastructure/src/main/resources/mapper/UserMapper.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 139b76ec..6008c84e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -153,7 +153,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } - queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); + queryWrapper.orderByAsc("c.corp_order").orderByAsc("u.sort").orderByDesc("u.create_time"); IPage result = userMapper.pageByNopermission(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 99c2f5aa..93bbb263 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -174,6 +174,7 @@ select d.name as department_name, p.post_name, + c.corp_name as corpinfoName, u.id, u.user_id, u.username,