From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/NodeController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/NodeController.java b/src/main/java/com/zy/crm/manager/controller/NodeController.java
index 6a847f9..716d25c 100644
--- a/src/main/java/com/zy/crm/manager/controller/NodeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/NodeController.java
@@ -238,9 +238,9 @@
@PostMapping(value = "/node/tree/auth")
@ManagerAuth
public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
- ArrayList<Map> tree = treeUtils.getNodeTree(String.valueOf(getOriginNode().getId()), getHostId());
+ ArrayList<Map<String, Object>> tree = treeUtils.getNodeTree(String.valueOf(getOriginNode().getId()), getHostId());
// 娣辨嫹璐�
- List<Map> result = ListUtils.deepCopy(tree);
+ List<Map<String, Object>> result = ListUtils.deepCopy(tree);
if (!Cools.isEmpty(condition)) {
treeUtils.remove(condition, result);
treeUtils.remove(condition, result);
--
Gitblit v1.9.1