aix
2024-07-24 2cba01a6b6f67cfa97d0c4e0cc589302fab817ba
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
@@ -81,10 +81,15 @@
   @Override
   public List<RoleVO> treeByParentId(String parentId) {
      if (AuthUtil.isAdministrator()) {
         return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY, RoleConstant.ADMINISTRATOR));
      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
   public List<RoleVO> treeByParentIdNew(String parentId) {
      return ForestNodeMerger.merge(baseMapper.treeByParentIdNew(parentId.split(",")));
   }
   @Override