@@ -20,9 +20,16 @@ class Menu extends Base {
2020 * @author zhaoxiang <[email protected] > 2121 */
2222 public function index () {
23- $ origin = (new AdminMenu )->order ('sort ' , 'ASC ' )->select ();
24- $ origin = Tools::buildArrFromObj ($ origin );
25- $ list = Tools::listToTree ($ origin );
23+ $ keywords = $ this ->request ->get ('keywords ' , '' );
24+ $ obj = new AdminMenu ();
25+ if ($ keywords ) {
26+ $ obj = $ obj ->whereLike ('title ' , "% {$ keywords }% " );
27+ }
28+ $ obj = $ obj ->order ('sort ' , 'ASC ' )->select ();
29+ $ list = Tools::buildArrFromObj ($ obj );
30+ if (!$ keywords ) {
31+ $ list = Tools::listToTree ($ list );
32+ }
2633
2734 return $ this ->buildSuccess ([
2835 'list ' => $ list
@@ -87,18 +94,15 @@ public function edit() {
8794 /**
8895 * 删除菜单
8996 * @return array
97+ * @throws \Exception
9098 * @author zhaoxiang <[email protected] > 9199 */
92100 public function del () {
93101 $ id = $ this ->request ->get ('id ' );
94102 if (!$ id ) {
95103 return $ this ->buildFailed (ReturnCode::EMPTY_PARAMS , '缺少必要参数 ' );
96104 }
97- $ childNum = AdminMenu::where (['fid ' => $ id ])->count ();
98- if ($ childNum ) {
99- return $ this ->buildFailed (ReturnCode::INVALID , '当前菜单存在子菜单,不可以被删除! ' );
100- }
101- AdminMenu::destroy ($ id );
105+ (new AdminMenu ())->whereIn ('id ' , $ id )->delete ();
102106
103107 return $ this ->buildSuccess ();
104108 }
0 commit comments