From a6864349f10e331fe08c25112613b8a2621476cb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 15:43:24 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/system/controller/UserLoginController.java | 6 +++++-
src/main/java/com/zy/system/controller/ConfigController.java | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index a005512..c5df1e4 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -40,7 +40,11 @@
EntityWrapper<Config> wrapper = new EntityWrapper<>();
convert(param, wrapper);
wrapper.orderBy("id", false);
- return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
+ List<Config> configList = configService.selectList(wrapper);
+ Page<Config> page = new Page<Config>(0, 10).setRecords(configList);
+ page.setTotal(configList.size());
+ return R.ok(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 69960f1..a264826 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -38,7 +38,11 @@
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
wrapper.orderBy("id", false);
- return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
+ List<UserLogin> userLoginList = userLoginService.selectList(wrapper);
+ Page<UserLogin> page = new Page<UserLogin>(0, 10).setRecords(userLoginList);
+ page.setTotal(userLoginList.size());
+ return R.ok(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1