From 5eaeb26b2e5c4318528d0366a4788e4a9b08af5f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 06 四月 2021 23:24:12 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 18 ++++++++++++++----
1 files changed, 14 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..4f3c8b1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -29,6 +29,16 @@
@Autowired
private TreeUtils treeUtils;
+ @RequestMapping(value = "/tag/list/pda/auth")
+ @ManagerAuth
+ public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Tag> wrapper = new EntityWrapper<>();
+ List<Tag> tags = tagService.selectList(wrapper);
+ return R.ok().add(tags);
+ }
+
@RequestMapping(value = "/tag/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -141,13 +151,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 +176,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