菜单，角色查询调整排序

zhongrj

2023-05-15 bdeb1fbd8a7933b8425bbed2b0093dfa1c2b4d3e

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

@@ -81,8 +81,8 @@

   @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));
   }