From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 4c47876..8e2b9b9 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -119,7 +119,7 @@
})
@GetMapping(value = "/selectByPage")
@PostMapping(value = "/selectByPage")
- public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize, Integer hasGeom) {
+ public ResponseMsg<List<?>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize, Integer hasGeom) {
try {
BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
if (null == baseMapper) {
@@ -145,7 +145,7 @@
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.desc("gid"));
- IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+ IPage<?> paged = baseMapper.selectPage(page, wrapper);
if (hasWkt && null != paged.getRecords()) {
copeWkt(paged.getRecords());
}
@@ -203,7 +203,7 @@
if (null == limit || limit < 1 || limit > StaticData.I100) {
limit = 20;
}
- if (null == buffer || buffer < 0 || buffer > StaticData.ONE_HUNDRED_THOUSAND) {
+ if (null == buffer || buffer < 0 || buffer > StaticData.I100000) {
buffer = 10.0;
}
--
Gitblit v1.9.3