From 0368c0b26c52b032e3ef86b3fda548d34fbfa4f7 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期日, 27 四月 2025 14:28:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index 35269f4..637505b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -69,7 +69,7 @@
@RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ convert2(param, wrapper);
allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)) {
if (orderByField.endsWith("$")) {
@@ -148,7 +148,7 @@
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
- convert(map, wrapper);
+ convert2(map, wrapper);
List<AgvWrkMast> list = agvWrkMastService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
--
Gitblit v1.9.1