Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/java/com/zy/common/utils/TreeUtils.java

@@ -119,7 +119,8 @@
    public void dealNode(Node parent, List<Map> list, Long hostId) {
        Wrapper<Node> wrapper = new EntityWrapper<Node>()
                .eq("parent_id", parent.getId())
                .eq("status", "1");
                .eq("status", "1")
                .ne("type",3);
        if (hostId != null) {
            wrapper.eq("host_id", hostId);
        }