Merge branch 'developer' into 'master'

恢复接口

See merge request !15

gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java

@@ -164,6 +164,13 @@ public interface MenuApiService {
     ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode);
 
     /**
+     * 运维处使用
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId);
+
+    /**
      * 查询gic菜单页面树数据
      * @Title: listMenuTree

      * @Description:

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -249,6 +249,16 @@ public class MenuApiServiceImpl implements MenuApiService {
     }
 
     @Override
+    public ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId) {
+        ServiceResponse<EnterpriseDTO> result = enterpriseApiService.getEnterpriseById(enterpriseId);
+        if (result.isSuccess()) {
+            String versionCode = result.getResult().getVersionCode();
+            return getAllMenuNotTree(versionCode);
+        }
+        return ServiceResponse.failure(result.getCode(), result.getMessage());
+    }
+
+    @Override
     public ServiceResponse<List<MenuDTO>> listMenuTree(MenuListQO params) {
         if (params.getIsGIC() == null) {
             params.setIsGIC(MenuProjectConstants.DEFAULT_PROJECT_CODE);