Merge remote-tracking branch 'origin/master'

linwe

2023-12-08 aa237538c7e5f71f92372cc6deda1b1fac2e79e5

 src/main/java/org/springblade/common/utils/NodeTreeUtil.java

@@ -62,7 +62,7 @@
    */
   public static List<TreeStringNode> getStringNodeTree(Map<String, TreeStringNode> treeMap){
      List<TreeStringNode> tree = new ArrayList<>();
      if (treeMap.size() > 1) {
      if (treeMap.size() > 0) {
         treeMap.forEach((id, treeNode) -> {
            if (treeMap.containsKey(treeNode.getParentId())) {
               treeMap.get(treeNode.getParentId()).getChildren().add(treeNode);