From c4419616823960e0b2cbdd192496a8962b944b57 Mon Sep 17 00:00:00 2001
From: solo-hx <6gEemAZ>
Date: Thu, 5 Sep 2019 15:33:30 +0800
Subject: [PATCH] =?UTF-8?q?Ztree=E5=B7=A5=E5=85=B7=E7=B1=BB=E9=87=8D?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/tree/{Ztree.java => Ztree2.java}    |  8 +++----
 .../ruoyi/common/utils/tree/ZtreeUtil.java    | 22 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/{Ztree.java => Ztree2.java} (96%)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree2.java
similarity index 96%
rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree2.java
index 60948e05f..e69a5415b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/Ztree2.java
@@ -13,14 +13,14 @@ import java.util.Map;
  * @author solo
  * @date 2019/09/05.
  */
-public class Ztree extends BaseBean {
+public class Ztree2 extends BaseBean {
     private String id;
     private String text;
     private String state;
     private boolean isParent;
     private boolean checked;;
     private int locked;
-    private List<Ztree> children;
+    private List<Ztree2> children;
     private String iconCls;
     private String pid;
     private Map<String, Object> attributes = new HashMap<String, Object>();
@@ -86,11 +86,11 @@ public class Ztree extends BaseBean {
         this.locked = locked;
     }
 
-    public List<Ztree> getChildren() {
+    public List<Ztree2> getChildren() {
         return children;
     }
 
-    public void setChildren(List<Ztree> children) {
+    public void setChildren(List<Ztree2> children) {
         this.children = children;
     }
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/ZtreeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/ZtreeUtil.java
index 28963bff7..008f62ca5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/ZtreeUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/tree/ZtreeUtil.java
@@ -14,9 +14,9 @@ import java.util.List;
  */
 public class ZtreeUtil {
 
-    public static List<Ztree> ztreeList(List<Ztree> list,String pid) {
-        List<Ztree> returnList = new ArrayList<Ztree>();
-        for (Ztree t : list) {
+    public static List<Ztree2> ztreeList(List<Ztree2> list, String pid) {
+        List<Ztree2> returnList = new ArrayList<Ztree2>();
+        for (Ztree2 t : list) {
             if (StringUtils.equals(t.getPid(), pid)) {
                 recursionFn(list, t);
                 returnList.add(t);
@@ -25,16 +25,16 @@ public class ZtreeUtil {
         return returnList;
     }
 
-    private static void  recursionFn(List<Ztree> list, Ztree t) {
-        List<Ztree> childList = getChildList(list, t);// 得到子节点列表
+    private static void  recursionFn(List<Ztree2> list, Ztree2 t) {
+        List<Ztree2> childList = getChildList(list, t);// 得到子节点列表
         t.setChildren(childList);
         t.setState("open");
         t.setIsParent(false);
-        for (Ztree tChild : childList) {
+        for (Ztree2 tChild : childList) {
             t.setState("closed");
             t.setIsParent(true);
             if (hasChild(list, tChild)) {// 判断是否有子节点
-                for (Ztree n : childList) {
+                for (Ztree2 n : childList) {
                     recursionFn(list, n);
                 }
             }
@@ -43,9 +43,9 @@ public class ZtreeUtil {
 
 
     // 得到子节点列表
-    private static List<Ztree> getChildList(List<Ztree> list, Ztree t) {
-        List<Ztree> tlist = new ArrayList<Ztree>();
-        for (Ztree n : list) {
+    private static List<Ztree2> getChildList(List<Ztree2> list, Ztree2 t) {
+        List<Ztree2> tlist = new ArrayList<Ztree2>();
+        for (Ztree2 n : list) {
             if (StringUtils.equals(n.getPid(), t.getId())) {
                 tlist.add(n);
             }
@@ -54,7 +54,7 @@ public class ZtreeUtil {
     }
 
     // 判断是否有子节点
-    private static boolean hasChild(List<Ztree> list, Ztree t) {
+    private static boolean hasChild(List<Ztree2> list, Ztree2 t) {
         return getChildList(list, t).size() > 0;
     }
 }