From 44be6da8fc2740a7e81d5b878a894e318b6a5f8c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 27 四月 2025 15:51:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index b06ff19..cb00be9 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -41,7 +41,13 @@
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
+ List<BasWrkIotype> basWrkIotypeList = basWrkIotypeService.selectList(wrapper);
+ Page<BasWrkIotype> page = new Page<BasWrkIotype>(0, 10).setRecords(basWrkIotypeList);
+ page.setTotal(basWrkIotypeList.size());
+ return R.ok(page);
+
+
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -123,9 +129,11 @@
public R query(String condition) {
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
wrapper.like("io_desc", condition);
- Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
+// Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
+ List<BasWrkIotype> basWrkIotypeList = basWrkIotypeService.selectList(wrapper);
+
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkIotype basWrkIotype : page.getRecords()){
+ for (BasWrkIotype basWrkIotype : basWrkIotypeList){
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkIotype.getIoType());
map.put("value", basWrkIotype.getIoDesc());
--
Gitblit v1.9.1