This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 2bb767c73 [Improve] mybatis getPage improvement
2bb767c73 is described below
commit 2bb767c7356bb92df7bd76d31036ca37cb9de1a2
Author: benjobs <[email protected]>
AuthorDate: Sun Dec 31 20:31:23 2023 +0800
[Improve] mybatis getPage improvement
---
.../console/base/mybatis/pager/MybatisPager.java | 58 +++++++---------------
.../service/alert/impl/AlertConfigServiceImpl.java | 2 +-
.../service/impl/ApplicationBackUpServiceImpl.java | 2 +-
.../service/impl/ApplicationConfigServiceImpl.java | 5 +-
.../service/impl/ApplicationLogServiceImpl.java | 5 +-
.../core/service/impl/ApplicationServiceImpl.java | 2 +-
.../core/service/impl/FlinkSqlServiceImpl.java | 5 +-
.../core/service/impl/MessageServiceImpl.java | 2 +-
.../core/service/impl/ProjectServiceImpl.java | 2 +-
.../core/service/impl/SavePointServiceImpl.java | 5 +-
.../core/service/impl/VariableServiceImpl.java | 2 +-
.../core/service/impl/YarnQueueServiceImpl.java | 2 +-
.../service/impl/AccessTokenServiceImpl.java | 2 +-
.../system/service/impl/MemberServiceImpl.java | 5 +-
.../system/service/impl/RoleServiceImpl.java | 2 +-
.../system/service/impl/TeamServiceImpl.java | 2 +-
.../system/service/impl/UserServiceImpl.java | 2 +-
17 files changed, 39 insertions(+), 66 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
index 8249d8791..9858dfcf1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
@@ -30,59 +30,37 @@ import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("unchecked")
-public final class MybatisPager<T> {
+public final class MybatisPager {
- public Page<T> getDefaultPage(RestRequest request) {
+ public static <T> Page<T> getPage(RestRequest request) {
if (request.getSortField() == null) {
request.setSortField(Constant.DEFAULT_SORT_FIELD);
+ } else {
+ boolean invalid = request.getSortField().trim().split("\\s+").length > 1;
+ if (invalid) {
+ throw new IllegalArgumentException(
+ String.format("Invalid argument sortField: %s",
request.getSortField()));
+ }
}
+
if (request.getSortOrder() == null) {
- request.setSortField(Constant.ORDER_DESC);
+ request.setSortOrder(Constant.ORDER_DESC);
}
- return getPage(request, request.getSortField(), request.getSortOrder());
- }
- public Page<T> getPage(RestRequest request, String defaultSort, String
defaultOrder) {
Page<T> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
List<OrderItem> orderItems = new ArrayList<>(0);
- if (!StringUtils.isAnyBlank(request.getSortField(),
request.getSortOrder())) {
-
- checkField(request.getSortField(), "sortField");
-
- String sortField = WebUtils.camelToUnderscore(request.getSortField());
- if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_DESC)) {
- orderItems.add(OrderItem.desc(sortField));
- } else if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_ASC)) {
- orderItems.add(OrderItem.asc(sortField));
- } else {
- throw new IllegalArgumentException("Invalid argument sortOrder: " +
request.getSortOrder());
- }
- } else if (StringUtils.isNotBlank(defaultSort)) {
- checkField(defaultSort, "defaultSort");
- if (StringUtils.equalsIgnoreCase(defaultOrder, Constant.ORDER_DESC)) {
- orderItems.add(OrderItem.desc(defaultSort));
- } else if (StringUtils.equalsIgnoreCase(defaultOrder,
Constant.ORDER_ASC)) {
- orderItems.add(OrderItem.asc(defaultSort));
- } else {
- throw new IllegalArgumentException("Invalid argument sortOrder: " +
defaultOrder);
- }
+ String sortField = WebUtils.camelToUnderscore(request.getSortField());
+ if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_DESC)) {
+ orderItems.add(OrderItem.desc(sortField));
+ } else if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_ASC)) {
+ orderItems.add(OrderItem.asc(sortField));
+ } else {
+ throw new IllegalArgumentException("Invalid argument sortOrder: " +
request.getSortOrder());
}
-
- if (!orderItems.isEmpty()) {
- page.setOrders(orderItems);
- }
-
+ page.setOrders(orderItems);
return page;
}
-
- private void checkField(String field, String fieldName) {
- boolean invalid = field != null && field.trim().split("\\s+").length > 1;
- if (invalid) {
- throw new IllegalArgumentException(
- String.format("Invalid argument %s: %s", fieldName, field));
- }
- }
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index 4074298e7..8ac83604d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -55,7 +55,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper();
wrapper.eq(params.getUserId() != null, AlertConfig::getUserId,
params.getUserId());
- Page<AlertConfig> page = new
MybatisPager<AlertConfig>().getDefaultPage(request);
+ Page<AlertConfig> page = MybatisPager.getPage(request);
IPage<AlertConfig> resultPage = getBaseMapper().selectPage(page, wrapper);
Page<AlertConfigWithParams> result = new Page<>();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
index 5622ee388..921522ac4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
@@ -63,7 +63,7 @@ public class ApplicationBackUpServiceImpl
@Override
public IPage<ApplicationBackUp> page(ApplicationBackUp backUp, RestRequest
request) {
- Page<ApplicationBackUp> page = new
MybatisPager<ApplicationBackUp>().getDefaultPage(request);
+ Page<ApplicationBackUp> page = MybatisPager.getPage(request);
LambdaQueryWrapper<ApplicationBackUp> queryWrapper =
new LambdaQueryWrapper<ApplicationBackUp>()
.eq(ApplicationBackUp::getAppId, backUp.getAppId());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
index bb020c11c..8f3b8d05b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java
@@ -19,7 +19,6 @@ package org.apache.streampark.console.core.service.impl;
import org.apache.streampark.common.util.DeflaterUtils;
import org.apache.streampark.common.util.Utils;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
@@ -207,8 +206,8 @@ public class ApplicationConfigServiceImpl
@Override
public IPage<ApplicationConfig> page(ApplicationConfig config, RestRequest
request) {
- Page<ApplicationConfig> page =
- new MybatisPager<ApplicationConfig>().getPage(request, "version",
Constant.ORDER_DESC);
+ request.setSortField("version");
+ Page<ApplicationConfig> page = MybatisPager.getPage(request);
IPage<ApplicationConfig> configList = this.baseMapper.pageByAppId(page,
config.getAppId());
fillEffectiveField(config.getAppId(), configList.getRecords());
return configList;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
index 7155020b4..756bcc4ef 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.streampark.console.core.service.impl;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.entity.ApplicationLog;
@@ -41,8 +40,8 @@ public class ApplicationLogServiceImpl extends
ServiceImpl<ApplicationLogMapper,
@Override
public IPage<ApplicationLog> page(ApplicationLog applicationLog, RestRequest
request) {
- Page<ApplicationLog> page =
- new MybatisPager<ApplicationLog>().getPage(request, "option_time",
Constant.ORDER_DESC);
+ request.setSortField("option_time");
+ Page<ApplicationLog> page = MybatisPager.getPage(request);
LambdaQueryWrapper<ApplicationLog> queryWrapper =
new LambdaQueryWrapper<ApplicationLog>()
.eq(ApplicationLog::getAppId, applicationLog.getAppId());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
index 0dd23f526..49f7a32f1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -483,7 +483,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
if (appParam.getTeamId() == null) {
return null;
}
- Page<Application> page = new
MybatisPager<Application>().getDefaultPage(request);
+ Page<Application> page = MybatisPager.getPage(request);
if (CommonUtils.notEmpty(appParam.getStateArray())) {
if (Arrays.stream(appParam.getStateArray())
.anyMatch(x -> x == FlinkAppState.FINISHED.getValue())) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
index c5e6961a1..f03af2ae0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
@@ -19,7 +19,6 @@ package org.apache.streampark.console.core.service.impl;
import org.apache.streampark.common.util.DeflaterUtils;
import org.apache.streampark.common.util.Utils;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.entity.Application;
@@ -215,8 +214,8 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
@Override
public IPage<FlinkSql> page(Long appId, RestRequest request) {
- Page<FlinkSql> page =
- new MybatisPager<FlinkSql>().getPage(request, "version",
Constant.ORDER_DESC);
+ request.setSortField("version");
+ Page<FlinkSql> page = MybatisPager.getPage(request);
LambdaQueryWrapper<FlinkSql> queryWrapper =
new LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId);
IPage<FlinkSql> sqlList = this.baseMapper.selectPage(page, queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
index 5a60fd968..497390136 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
@@ -48,7 +48,7 @@ public class MessageServiceImpl extends
ServiceImpl<MessageMapper, Message>
@Override
public IPage<Message> getUnRead(NoticeType noticeType, RestRequest request) {
- Page<Message> page = new MybatisPager<Message>().getDefaultPage(request);
+ Page<Message> page = MybatisPager.getPage(request);
LambdaQueryWrapper<Message> queryWrapper =
new LambdaQueryWrapper<Message>()
.eq(Message::getIsRead, false)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index 96da9fec4..cc8745903 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -178,7 +178,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
public IPage<Project> page(Project project, RestRequest request) {
- Page<Project> page = new MybatisPager<Project>().getDefaultPage(request);
+ Page<Project> page = MybatisPager.getPage(request);
return this.baseMapper.page(page, project);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index 843a34850..85b051e57 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -22,7 +22,6 @@ import
org.apache.streampark.common.util.CompletableFutureUtils;
import org.apache.streampark.common.util.PropertiesUtils;
import org.apache.streampark.common.util.ThreadUtils;
import org.apache.streampark.common.util.Utils;
-import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.exception.InternalException;
@@ -422,8 +421,8 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
@Override
public IPage<SavePoint> page(SavePoint savePoint, RestRequest request) {
- Page<SavePoint> page =
- new MybatisPager<SavePoint>().getPage(request, "trigger_time",
Constant.ORDER_DESC);
+ request.setSortField("trigger_time");
+ Page<SavePoint> page = MybatisPager.getPage(request);
LambdaQueryWrapper<SavePoint> queryWrapper =
new LambdaQueryWrapper<SavePoint>().eq(SavePoint::getAppId,
savePoint.getAppId());
return this.page(page, queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
index 417d431c2..32c2a74e1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
@@ -95,7 +95,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
if (variable.getTeamId() == null) {
return null;
}
- Page<Variable> page = new MybatisPager<Variable>().getDefaultPage(request);
+ Page<Variable> page = MybatisPager.getPage(request);
return this.baseMapper.page(page, variable);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
index 22872d118..485695826 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
@@ -75,7 +75,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
public IPage<YarnQueue> findYarnQueues(YarnQueue yarnQueue, RestRequest
request) {
Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null.");
Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params
mustn't be null.");
- Page<YarnQueue> page = new
MybatisPager<YarnQueue>().getDefaultPage(request);
+ Page<YarnQueue> page = MybatisPager.getPage(request);
return this.baseMapper.findQueues(page, yarnQueue);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 19fa3a1d5..99dee4dfd 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -88,7 +88,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
@Override
public IPage<AccessToken> findAccessTokens(AccessToken tokenParam,
RestRequest request) {
- Page<AccessToken> page = new
MybatisPager<AccessToken>().getDefaultPage(request);
+ Page<AccessToken> page = MybatisPager.getPage(request);
this.baseMapper.page(page, tokenParam);
List<AccessToken> records = page.getRecords();
page.setRecords(records);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 56a3b3e18..8a50e6c2f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -20,6 +20,7 @@ package org.apache.streampark.console.system.service.impl;
import org.apache.streampark.common.util.Utils;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.system.entity.Member;
import org.apache.streampark.console.system.entity.Team;
import org.apache.streampark.console.system.entity.User;
@@ -76,9 +77,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
@Override
public IPage<Member> findUsers(Member member, RestRequest request) {
ApiAlertException.throwIfNull(member.getTeamId(), "The team id is
required.");
- Page<Member> page = new Page<>();
- page.setCurrent(request.getPageNum());
- page.setSize(request.getPageSize());
+ Page<Member> page = MybatisPager.getPage(request);
return baseMapper.findUsers(page, member);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index 1df300099..bc2c830a9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -60,7 +60,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Override
public IPage<Role> findRoles(Role role, RestRequest request) {
- Page<Role> page = new MybatisPager<Role>().getDefaultPage(request);
+ Page<Role> page = MybatisPager.getPage(request);
return this.baseMapper.findRole(page, role);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index deb54e2f3..eb4d3d66e 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -65,7 +65,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public IPage<Team> findTeams(Team team, RestRequest request) {
- Page<Team> page = new MybatisPager<Team>().getDefaultPage(request);
+ Page<Team> page = MybatisPager.getPage(request);
return this.baseMapper.findTeam(page, team);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index fe345e9e7..a77c0563a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -71,7 +71,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Override
public IPage<User> findUserDetail(User user, RestRequest request) {
- Page<User> page = new MybatisPager<User>().getDefaultPage(request);
+ Page<User> page = MybatisPager.getPage(request);
IPage<User> resPage = this.baseMapper.findUserDetail(page, user);
Utils.notNull(resPage);
if (resPage.getTotal() == 0) {
