From 7e2347d5414d8db22e48b00bf903b85fa68c0de5 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 10 九月 2025 10:37:23 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ea2ca04..a43b11f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -277,6 +277,9 @@
public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
auth(appkey, param, request);
LocMast locMast = locMastService.selectById(param.getLocNo());
+ if (locMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
HashMap<String, Object> map = new HashMap<>();
map.put("status", locMast.getLocSts());
@@ -287,9 +290,17 @@
@RequestMapping(value = "/locMast/sts")
@Synchronized
public R list(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit) {
+ @RequestParam(defaultValue = "100000") Integer limit) {
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<LocMast> locMastPage = locMastService.selectPage(new Page<>(curr, limit), wrapper);
+ List<Object> list = new ArrayList<>();
+ for (LocMast locmast : locMastPage.getRecords()) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("sts", locmast.getLocSts());
+ map.put("loc", locmast.getLocNo());
+ list.add(map);
+ }
+ return R.ok(list);
}
--
Gitblit v1.9.1