From 8ba09d4d1d33c1f7bba95c203861f8260fc2f8f7 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 28 Nov 2025 14:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E5=8F=8A?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/nacos.yml | 2 +- .../persistence/repository/impl/UserRepositoryImpl.java | 6 +++++- web-infrastructure/src/main/resources/mapper/UserMapper.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index c0ab37e..d850fed 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -4,7 +4,7 @@ nacos: application: name: jjb-saas-zcloud-basic-info version: - gateway: basic-info + gateway: basicInfo cn-name: 统一用户管理 spring: application: 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 991e39f..931c412 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 @@ -71,6 +71,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i queryWrapper.orderByDesc("u.sort"); queryWrapper.eq("u.delete_enum", "FALSE"); queryWrapper.apply("u.id != u.corpinfo_id"); + queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); IPage result = userMapper.selectUserPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -154,9 +155,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @Override public List listByPostId(Long postId) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("post_id", postId); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); List userPostList = this.list(queryWrapper); return userPostList; } @@ -166,6 +168,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("post_id", postIds); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); List userPostList = this.list(queryWrapper); return userPostList; } @@ -175,6 +178,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("corpinfo_id", corpInfoId); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); return list(queryWrapper); } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 1ed6a7a..7a5e8f4 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -89,7 +89,7 @@ - order by + order by u.sort , u.create_time desc