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/RoleServiceImpl.java

@@ -81,10 +81,10 @@

   @Override
   public List<RoleVO> treeByParentId(String parentId) {
      if (AuthUtil.isAdministrator()) {
      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