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 children; + private List children; private String iconCls; private String pid; private Map attributes = new HashMap(); @@ -86,11 +86,11 @@ public class Ztree extends BaseBean { this.locked = locked; } - public List getChildren() { + public List getChildren() { return children; } - public void setChildren(List children) { + public void setChildren(List 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 ztreeList(List list,String pid) { - List returnList = new ArrayList(); - for (Ztree t : list) { + public static List ztreeList(List list, String pid) { + List returnList = new ArrayList(); + 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 list, Ztree t) { - List childList = getChildList(list, t);// 得到子节点列表 + private static void recursionFn(List list, Ztree2 t) { + List 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 getChildList(List list, Ztree t) { - List tlist = new ArrayList(); - for (Ztree n : list) { + private static List getChildList(List list, Ztree2 t) { + List tlist = new ArrayList(); + 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 list, Ztree t) { + private static boolean hasChild(List list, Ztree2 t) { return getChildList(list, t).size() > 0; } }