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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java

@@ -308,7 +308,8 @@

   @Override
   public List<MenuVO> getAppMenu(String roleId) {
      return baseMapper.selectAppMenu(roleId);
      String[] ids = roleId.split(",");
      return baseMapper.selectAppMenu(ids);
   }

   @Override
@@ -317,7 +318,8 @@
      List<MenuVO> routes = routes(roleId, null);

      List<MenuVO> list = routes.stream().filter(r -> Func.equals(r.getAlias(), "web")).collect(Collectors.toList());
      list.contains(routes.stream().filter(r -> Func.equals(r.getAlias(), "newWeb")).collect(Collectors.toList()));
      list.addAll(routes.stream().filter(r -> Func.equals(r.getAlias(), "newWeb")).collect(Collectors.toList()));
      list.addAll(routes.stream().filter(r -> Func.equals(r.getAlias(), "superWeb")).collect(Collectors.toList()));
      if (list.size()>0){
         MenuVO menuVO = list.get(0);
//         int level = 0;