From 0444972925d67eb9e32c9b2d36f2eda24d2f58c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
index 1bc690d..85506d6 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -55,8 +55,9 @@
@Override
public IPage<SystemUser> findUserDetailList(SystemUser user, QueryRequest request) {
Page<SystemUser> page = new Page<>(request.getPageNum(), request.getPageSize());
+ String currentUserId= FebsUtil.getUserId();
SortUtil.handlePageSort(request, page, "userId", FebsConstant.ORDER_ASC, false);
- return this.baseMapper.findUserDetailPage(page, user);
+ return this.baseMapper.findUserDetailPage(page, user, currentUserId);
}
@Override
--
Gitblit v1.8.0