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

guoshilong

2023-05-23 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa

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

@@ -84,7 +84,7 @@
      if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
         return ForestNodeMerger.merge(baseMapper.tree(null, RoleConstant.ADMINISTRATOR));
      }
      return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
      return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId.split(",")));
   }

   @Override