From 918cf69e763d30a1315fa1c83a964dae4dd88f12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期六, 03 四月 2021 15:11:08 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/TagController.java b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
index c75d20b..6ca7410 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -141,13 +141,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.like("uuid", condition).or().like("name", condition);
Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", tag.getId());
- map.put("value", tag.getId());
+ map.put("value", tag.getName());
result.add(map);
}
return R.ok(result);
@@ -173,7 +173,7 @@
treeUtils.remove(condition, result);
treeUtils.remove(condition, result);
}
- return R.ok(tree);
+ return R.ok(result);
}
}
--
Gitblit v1.9.1