From 84edd2b6308fa018eab932a2db528b7e6e1e6d13 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/LocOwnerController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
index 9f9f0b2..e9f0e1c 100644
--- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java
+++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
@@ -114,13 +114,14 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.like("owner", condition);
+ wrapper.eq("status", 1);
Page<LocOwner> page = locOwnerService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocOwner locOwner : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", locOwner.getId());
- map.put("value", locOwner.getId());
+ map.put("value", locOwner.getOwner());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1