Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -148,6 +148,10 @@
                  if (union.size() == 0) {
                     iterator.remove();
                  }
               } else {
                  if (next.getName().equals("标签报事")) {
                     iterator.remove();
                  }
               }
            }
         }
@@ -360,7 +364,7 @@
      List<List<String>> labelList = menu.getLabelList();
      StringBuffer stringBuffer = new StringBuffer();
      for (List<String> strings : labelList) {
         stringBuffer.append(strings.get(2)).append(",");
         stringBuffer.append(strings.get(strings.size()-1)).append(",");
      }
      menu.setLabelId(stringBuffer.toString());
      menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);