From c3434b1fe0132372b34ff0a46d84e6129a094bfc Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 28 八月 2025 08:43:15 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index e95f0b7..55fb00f 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -41,7 +41,11 @@
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+ List<BasCrnp> basCrnpList = basCrnpService.selectList(wrapper);
+ Page<BasCrnp> page = new Page<BasCrnp>(0, 100).setRecords(basCrnpList);
+ page.setTotal(basCrnpList.size());
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -72,7 +76,7 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
public R update(BasCrnp basCrnp){
if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
- return R.error();
+ return R.error("璇烽�夋嫨鍫嗗灈鏈哄啀鎿嶄綔").add("璇烽�夋嫨鍫嗗灈鏈哄啀鎿嶄綔");
}
basCrnp.setModiUser(getUserId());
basCrnp.setModiTime(new Date());
@@ -109,9 +113,10 @@
public R query(String condition) {
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
wrapper.like("crn_no", condition);
- Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
+// Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
+ List<BasCrnp> basCrnpList = basCrnpService.selectList(wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnp basCrnp : page.getRecords()){
+ for (BasCrnp basCrnp : basCrnpList){
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnp.getCrnNo());
map.put("value", basCrnp.getCrnNo());
--
Gitblit v1.9.1