diff --git a/application/adminapi/controller/Nobility.php b/application/adminapi/controller/Nobility.php index c347ac4..1338d60 100644 --- a/application/adminapi/controller/Nobility.php +++ b/application/adminapi/controller/Nobility.php @@ -330,7 +330,9 @@ class Nobility extends adminApi if (!$decorate) { return V(0, "该装扮不存在"); } - $nobility_dress_info = db::name('vs_nobility_decorate')->where(['lid'=>$lid, 'dpid'=>$dpid])->find(); + $nobility_dress_info = db::name('vs_nobility_decorate') + ->where('delete_time', 0) + ->where(['lid'=>$lid, 'dpid'=>$dpid])->find(); if ($nobility_dress_info) { return V(0, "该爵位已添加该装扮"); } @@ -354,11 +356,13 @@ class Nobility extends adminApi $order = input('order', 'id'); $sort = input('sort', 'desc'); $page = input('page', 1); + $lid = input('lid', ''); $page_limit = input('page_limit', 30); $count = db::name('vs_nobility_decorate')->where('delete_time', 0)->count(); $lists = db::name('vs_nobility_decorate') ->field('id,lid,did,type,dpid,day,createtime,updatetime') ->where('delete_time', 0) + ->where('lid', $lid) ->order($order, $sort) ->page($page, $page_limit) ->select();