字段修改

application/index/service/OfficeRoomService.php

@@ -883,7 +883,7 @@ class OfficeRoomService
                 $room_data[$k]['price_total'] = $room_data[$k]['price_total']/100;
                 $room_data[$k]['price'] = $room_data[$k]['price']/100;
 
-                $dish_name = $this->agent_room->getAgentsByRoomColumn('b.name', ['a.house_id'=>$v['id']]);
+                $dish_name = $this->agent_room->getAgentsByRoomColumn('b.name', ['a.house_id'=>$v['id'],'a.type'=>2]);
                 if (empty($dish_name)) {
                     $room_data[$k]['dish_name'] = '';
                 } else {
@@ -931,6 +931,8 @@ class OfficeRoomService
         /*状态 1上架 2下架*/
         if (isset($params['status'])) {
             $where['a.status'] = $params['status'];
+        } else {
+            $where['a.status'] = ['<>', 3];
         }
 
         /*是否已租 0未租 1已租*/

application/index/validate/OfficeBuildingRoomValidate.php

@@ -45,6 +45,7 @@ class OfficeBuildingRoomValidate extends Validate
         'is_carefully_chosen' => 'require|in:0,1',
         'agent_start_time' => 'require',
         'agent_end_time' => 'require',
+        'title'=>'require'
     ];
 
     protected $message = [
@@ -103,6 +104,7 @@ class OfficeBuildingRoomValidate extends Validate
         'is_carefully_chosen.in' => '是否精选参数错误',
         'agent_start_time.require' => '独家开始时间必填',
         'agent_end_time.require' => '独家结束时间必填',
+        'title.require'=>'楼盘字段标题必传'
     ];
 
     protected $scene = [

application/index/validate/OfficeBuildingValidate.php

@@ -52,7 +52,10 @@ class OfficeBuildingValidate extends Validate
         'upload_id.require' => '上传人id必传',
         'upload_id.between' => '上传人id错误',
         'intro.require'=>'楼盘简介必填',
-        'intro.length'=>'楼盘简介要做1至255个字'
+        'intro.length'=>'楼盘简介要做1至255个字',
+        'floor_total.require'=>'总层数不能为空',
+        'floor_total.between'=>'总层数参数错误',
+        'type.require'=>'类型不为空'
     ];
 
     protected $scene = [

application/model/OfficeGLandlordPhone.php

@@ -88,6 +88,7 @@ class OfficeGLandlordPhone extends BaseModel
 
         $num = 0;
         foreach ($data as $k=>$v) {
+            $save_data = [];
             if (empty($v['id'])) {
                 continue;
             }

application/model/OfficeGRoomToAgent.php

@@ -89,6 +89,7 @@ class OfficeGRoomToAgent extends BaseModel
     {
         $num = 0;
         foreach ($data as $k=>$v) {
+            $save_data = [];
             if (isset($v['agent_id'])) {
                 $save_data['agent_id'] = $v['agent_id'];
             }