From cbdfab5f522a1e4076eb8cd773674b9eb66280c2 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Wed, 25 Mar 2020 00:21:06 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Menu.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 0f5c3b4..2ad806a 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -20,9 +20,16 @@ class Menu extends Base {
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
     public function index() {
-        $origin = (new AdminMenu)->order('sort', 'ASC')->select();
-        $origin = Tools::buildArrFromObj($origin);
-        $list = Tools::listToTree($origin);
+        $keywords = $this->request->get('keywords', '');
+        $obj = new AdminMenu();
+        if ($keywords) {
+            $obj = $obj->whereLike('title', "%{$keywords}%");
+        }
+        $obj = $obj->order('sort', 'ASC')->select();
+        $list = Tools::buildArrFromObj($obj);
+        if (!$keywords) {
+            $list = Tools::listToTree($list);
+        }
 
         return $this->buildSuccess([
             'list' => $list
@@ -87,6 +94,7 @@ class Menu extends Base {
     /**
      * 删除菜单
      * @return array
+     * @throws \Exception
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
     public function del() {
@@ -94,11 +102,7 @@ class Menu extends Base {
         if (!$id) {
             return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
         }
-        $childNum = AdminMenu::where(['fid' => $id])->count();
-        if ($childNum) {
-            return $this->buildFailed(ReturnCode::INVALID, '当前菜单存在子菜单,不可以被删除!');
-        }
-        AdminMenu::destroy($id);
+        (new AdminMenu())->whereIn('id', $id)->delete();
 
         return $this->buildSuccess();
     }