From af121f9c655a4f9a6ea87d363b294ddd12a77fb5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 15:26:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/NodeController.java | 4 ++--
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
index c2ed398..dcbda41 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
@@ -144,13 +144,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
- wrapper.like("name", condition);
+ wrapper.like("name", condition).or().like("uuid", condition);
Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Node node : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", node.getId());
- map.put("value", node.getName());
+ map.put("value", node.getUuid() + "锛�" +node.getName()+ "锛�");
result.add(map);
}
return R.ok(result);
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 511d1f7..6ca7410 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -147,7 +147,7 @@
for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", tag.getId());
- map.put("value", tag.getUuid() + "(" + tag.getName() + ")");
+ map.put("value", tag.getName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1