From 868d326d592896d46f544298e2846a0377b4ebd0 Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Mon, 2 Sep 2019 14:41:07 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wiki/controller/Api.php | 34 +++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/application/wiki/controller/Api.php b/application/wiki/controller/Api.php
index 7425601..e3207c1 100644
--- a/application/wiki/controller/Api.php
+++ b/application/wiki/controller/Api.php
@@ -91,23 +91,35 @@ class Api extends Base {
 
     public function groupList() {
         $groupInfo = AdminGroup::all();
-        $groupInfo = Tools::buildArrFromObj($groupInfo, 'hash');
         $apiInfo = AdminList::all();
-        $apiInfo = Tools::buildArrFromObj($apiInfo, 'hash');
-
-        $app_api_show = json_decode($this->appInfo['app_api_show'], true);
 
         $listInfo = [];
-        foreach ($app_api_show as $key => $item) {
-            $_listInfo = $groupInfo[$key];
-            foreach ($item as $apiItem) {
-                $_listInfo['api_info'][] = $apiInfo[$apiItem];
+        if ($this->appInfo['app_id'] === -1) {
+            $_apiInfo = [];
+            foreach ($apiInfo as $aVal) {
+                $_apiInfo[$aVal['group_hash']][] = $aVal;
+            }
+            foreach ($groupInfo as $gVal ) {
+                if (isset($_apiInfo[$gVal['hash']])) {
+                    $gVal['api_info'] = $_apiInfo[$gVal['hash']];
+                } else {
+                    $gVal['api_info'] = [];
+                }
+                $listInfo[] = $gVal;
+            }
+        } else {
+            $apiInfo = Tools::buildArrFromObj($apiInfo, 'hash');
+            $groupInfo = Tools::buildArrFromObj($groupInfo, 'hash');
+            $app_api_show = json_decode($this->appInfo['app_api_show'], true);
+            foreach ($app_api_show as $key => $item) {
+                $_listInfo = $groupInfo[$key];
+                foreach ($item as $apiItem) {
+                    $_listInfo['api_info'][] = $apiInfo[$apiItem];
+                }
+                $listInfo[] = $_listInfo;
             }
-
-            $listInfo[] = $_listInfo;
         }
 
-
         return $this->buildSuccess([
             'data' => $listInfo,
             'co'   => config('apiadmin.APP_NAME') . ' ' . config('apiadmin.APP_VERSION')