From b922fe4d80f7e278b1ff958c4c95626b27cf8266 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 12 四月 2024 15:42:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/NodeController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 2c87cdd..ab6619a 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -81,7 +81,8 @@
convert(param, wrapper);
hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
+ List<Node> nodes = nodeService.selectList(wrapper);
+ return R.parse("0-鎿嶄綔鎴愬姛").add(nodes);
}
@RequestMapping(value = "/node/tree/auth")
--
Gitblit v1.9.1