From cf5a2c31c17485672289bba5a5215d34084b0602 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Thu, 18 Apr 2019 11:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=8F=9C=E5=8D=95=E5=92=8C=E5=90=8E=E5=8F=B0=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=A0=B7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/setting/SystemMenus.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/admin/controller/setting/SystemMenus.php b/application/admin/controller/setting/SystemMenus.php index 0aaf2d09..d15166cd 100644 --- a/application/admin/controller/setting/SystemMenus.php +++ b/application/admin/controller/setting/SystemMenus.php @@ -53,10 +53,13 @@ class SystemMenus extends AuthController { $controller = ''; if($cid)$controller = MenusModel::where('id',$cid)->value('controller')?:''; +// var_dump(MenusModel::order('pid ASC,sort DESC,id DESC')->all()->toArray()); $field = [ Form::input('menu_name','按钮名称')->required('按钮名称必填'), Form::select('pid','父级id',$cid)->setOptions(function(){ - $list = (Util::sortListTier(MenusModel::all()->toArray(),'顶级','pid','menu_name')); + $list = (Util::sortListTier(MenusModel::all(function($m){ + $m->order('sort DESC,id ASC'); + })->toArray(),'顶级','pid','menu_name')); $menus = [['value'=>0,'label'=>'顶级按钮']]; foreach ($list as $menu){ $menus[] = ['value'=>$menu['id'],'label'=>$menu['html'].$menu['menu_name']]; @@ -113,7 +116,9 @@ class SystemMenus extends AuthController $field = [ Form::input('menu_name','按钮名称',$menu['menu_name']), Form::select('pid','父级id',(string)$menu->getData('pid'))->setOptions(function()use($id){ - $list = (Util::sortListTier(MenusModel::where('id','<>',$id)->select()->toArray(),'顶级','pid','menu_name')); + $list = (Util::sortListTier(MenusModel::all(function($m){ + $m->order('sort DESC,id ASC'); + })->toArray(),'顶级','pid','menu_name')); $menus = [['value'=>0,'label'=>'顶级按钮']]; foreach ($list as $menu){ $menus[] = ['value'=>$menu['id'],'label'=>$menu['html'].$menu['menu_name']];