From 641de82a0458ab5ba66b5e735895caad26708fa8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 12 四月 2021 11:24:56 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/NodeController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 dcbda41..7c4f356 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
@@ -50,6 +50,20 @@
return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/node/tree/auth")
+ @ManagerAuth
+ public R tree(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Node> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
+ }
+
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
@@ -144,7 +158,7 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
- wrapper.like("name", condition).or().like("uuid", condition);
+ wrapper.like("name", condition).or().like("uuid", condition).eq("type", 3);
Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Node node : page.getRecords()){
--
Gitblit v1.9.1