From af73582c1bd3c20e2e805d4df56c111073d3fd6f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 13:02:35 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 8cedaf2..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);
@@ -166,14 +166,14 @@
@PostMapping(value = "/tag/tree/auth")
@ManagerAuth
public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
- ArrayList<Map> tree = treeUtils.getTree("1");
+ ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()));
// 娣辨嫹璐�
List<Map> result = ListUtils.deepCopy(tree);
if (!Cools.isEmpty(condition)) {
treeUtils.remove(condition, result);
treeUtils.remove(condition, result);
}
- return R.ok(tree);
+ return R.ok(result);
}
}
--
Gitblit v1.9.1