From 251494acbe9b2b7258175828c71a2389a0c4a58c Mon Sep 17 00:00:00 2001
From: nizongfeng <nizongfeng@gmail.com>
Date: Tue, 23 Nov 2021 16:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/CfItem.php     | 4 ++--
 application/admin/controller/CfRoomInfo.php | 2 +-
 application/admin/controller/CfRoomPlan.php | 4 ++--
 application/admin/model/CfHotelInfo.php     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/admin/controller/CfItem.php b/application/admin/controller/CfItem.php
index 03fdd51..44cf12d 100755
--- a/application/admin/controller/CfItem.php
+++ b/application/admin/controller/CfItem.php
@@ -214,9 +214,9 @@ class CfItem extends Backend
         $keyValue=$this->request->post('keyValue');
         $this->model->field('id,item_name as name,item_unit,item_type,item_memo');
         if($keyValue){
-            $this->model->where(['id'=>$keyValue]);
+            $this->model->where(['id'=>$keyValue,"del_flag"=>0]);
         }elseif($name){
-            $this->model->where(['item_name'=>['like','%'.$name.'%']]);
+            $this->model->where(['item_name'=>['like','%'.$name.'%'],"del_flag"=>0]);
         }
         $result= $this->model->select()->toArray();
 
diff --git a/application/admin/controller/CfRoomInfo.php b/application/admin/controller/CfRoomInfo.php
index 114bd94..64340a3 100755
--- a/application/admin/controller/CfRoomInfo.php
+++ b/application/admin/controller/CfRoomInfo.php
@@ -181,7 +181,7 @@ class CfRoomInfo extends Backend
         $hotelId=$this->request->get('hotelId');
         $result=  $this->model
             ->field("id,room_name as name,room_memo")
-            ->where("hotel_id","=",$hotelId)->select();
+            ->where(["hotel_id"=>$hotelId,"del_flag"=>0])->select();
         return json(['list' => $result]);
     }
 
diff --git a/application/admin/controller/CfRoomPlan.php b/application/admin/controller/CfRoomPlan.php
index ff9800e..890867e 100755
--- a/application/admin/controller/CfRoomPlan.php
+++ b/application/admin/controller/CfRoomPlan.php
@@ -53,9 +53,9 @@ class CfRoomPlan extends Backend
         $keyValue=$this->request->post('keyValue');
         $this->model->field('id,plan_name as name,purchase_user_id,plan_memo');
         if($keyValue){
-            $this->model->where(['id'=>$keyValue]);
+            $this->model->where(['id'=>$keyValue,"del_flag"=>0]);
         }elseif($name){
-            $this->model->where(['plan_name'=>['like','%'.$name.'%']]);
+            $this->model->where(['plan_name'=>['like','%'.$name.'%'],"del_flag"=>0]);
         }
         $roomId =$this->request->get('room_id');
         if ($roomId){
diff --git a/application/admin/model/CfHotelInfo.php b/application/admin/model/CfHotelInfo.php
index 8b2e501..3e2acfa 100755
--- a/application/admin/model/CfHotelInfo.php
+++ b/application/admin/model/CfHotelInfo.php
@@ -32,9 +32,9 @@ class CfHotelInfo extends Model
     public function getList($name='',$keyValue=''){
         $this->field('id,hotel_name as name');
         if($keyValue){
-            $this->where(['id'=>$keyValue]);
+            $this->where(['id'=>$keyValue,"del_flag"=>0]);
         }elseif($name){
-            $this->where(['hotel_name'=>['like','%'.$name.'%']]);
+            $this->where(['hotel_name'=>['like','%'.$name.'%'],"del_flag"=>0]);
         }
         return $this->select()->toArray();
     }