@@ -213,12 +213,13 @@ class CfItem extends Backend | |||||
$name=$this->request->post('name'); | $name=$this->request->post('name'); | ||||
$keyValue=$this->request->post('keyValue'); | $keyValue=$this->request->post('keyValue'); | ||||
$this->model->field('id,item_name as name,item_unit,item_type,item_memo'); | $this->model->field('id,item_name as name,item_unit,item_type,item_memo'); | ||||
$where = ["del_flag"=>0]; | |||||
if($keyValue){ | if($keyValue){ | ||||
$this->model->where(['id'=>$keyValue,"del_flag"=>0]); | |||||
$where = ['id'=>$keyValue,"del_flag"=>0]; | |||||
}elseif($name){ | }elseif($name){ | ||||
$this->model->where(['item_name'=>['like','%'.$name.'%'],"del_flag"=>0]); | |||||
$where = ['item_name'=>['like','%'.$name.'%'],"del_flag"=>0]; | |||||
} | } | ||||
$result= $this->model->select()->toArray(); | |||||
$result= $this->model->where($where)->select()->toArray(); | |||||
$config = \think\Config::get("site.item_category"); | $config = \think\Config::get("site.item_category"); | ||||
$config = json_decode($config,true); | $config = json_decode($config,true); | ||||
@@ -52,16 +52,17 @@ class CfRoomPlan extends Backend | |||||
$name=$this->request->post('name'); | $name=$this->request->post('name'); | ||||
$keyValue=$this->request->post('keyValue'); | $keyValue=$this->request->post('keyValue'); | ||||
$this->model->field('id,plan_name as name,purchase_user_id,plan_memo'); | $this->model->field('id,plan_name as name,purchase_user_id,plan_memo'); | ||||
$where = ["del_flag"=>0]; | |||||
if($keyValue){ | if($keyValue){ | ||||
$this->model->where(['id'=>$keyValue,"del_flag"=>0]); | |||||
$where = ['id'=>$keyValue,"del_flag"=>0]; | |||||
}elseif($name){ | }elseif($name){ | ||||
$this->model->where(['plan_name'=>['like','%'.$name.'%'],"del_flag"=>0]); | |||||
$where = ['plan_name'=>['like','%'.$name.'%'],"del_flag"=>0]; | |||||
} | } | ||||
$roomId =$this->request->get('room_id'); | $roomId =$this->request->get('room_id'); | ||||
if ($roomId){ | if ($roomId){ | ||||
$this->model->where("room_id","=",$roomId); | |||||
$where["room_id"] = $roomId; | |||||
} | } | ||||
$result= $this->model->select(); | |||||
$result= $this->model->where($where)->select(); | |||||
if($keyValue){ | if($keyValue){ | ||||
return json(['list' => $result]); | return json(['list' => $result]); | ||||
} | } | ||||
@@ -31,12 +31,13 @@ class CfHotelInfo extends Model | |||||
public function getList($name='',$keyValue=''){ | public function getList($name='',$keyValue=''){ | ||||
$this->field('id,hotel_name as name'); | $this->field('id,hotel_name as name'); | ||||
$where = ["del_flag"=>0]; | |||||
if($keyValue){ | if($keyValue){ | ||||
$this->where(['id'=>$keyValue,"del_flag"=>0]); | |||||
$where = ['id'=>$keyValue,"del_flag"=>0]; | |||||
}elseif($name){ | }elseif($name){ | ||||
$this->where(['hotel_name'=>['like','%'.$name.'%'],"del_flag"=>0]); | |||||
$where = ['hotel_name'=>['like','%'.$name.'%'],"del_flag"=>0]; | |||||
} | } | ||||
return $this->select()->toArray(); | |||||
return $this->where($where)->select()->toArray(); | |||||
} | } | ||||