|
|
@@ -151,7 +151,7 @@ class Action extends BaseController
|
|
|
*/
|
|
|
public function index(){
|
|
|
$post =$this->request->post();
|
|
|
- $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1])->select();
|
|
|
+ $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1,"is_del"=>0])->select();
|
|
|
$result = [];
|
|
|
if(empty($data)){
|
|
|
return app_show(0,"获取成功",$result);
|
|
|
@@ -161,7 +161,7 @@ class Action extends BaseController
|
|
|
$result[$val['id']] =$val;
|
|
|
}
|
|
|
|
|
|
- $child =Db::name("admin_menu")->where("pid","<>",0)->where('status',"=",1)->select();
|
|
|
+ $child =Db::name("admin_menu")->where([["pid","<>",0],['status',"=",1],["is_del","=",0]])->select();
|
|
|
foreach ($child as $k=>$value){
|
|
|
// $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
|
|
|
$act =Db::name("action")->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
|
