where

application/index/service/OfficeRoomService.php

@@ -91,7 +91,14 @@ class OfficeRoomService
             return $result;
         }
 
-        $where['b.city']    = $data['city'];
+        $status   = $this->m_office->getFindData('status,city', ['id' => $data['building_id']]);//验证办公楼字典是否完整
+        $is_alert = 0;
+        if ($status['status'] != 1) {
+            $is_alert       = 1;
+            $data['status'] = 2;
+        }
+
+        $where['b.city']    = $status['city'];
         $where['a.floor']   = $data['floor'];
         $where['a.mansion'] = $data['mansion'];
         $where['a.room_number'] = $data['room_number'];
@@ -102,13 +109,6 @@ class OfficeRoomService
             return $result;
         }
 
-        $status   = $this->m_office->getFieldOneValue('status', ['id' => $data['building_id']]);//验证办公楼字典是否完整
-        $is_alert = 0;
-        if ($status != 1) {
-            $is_alert       = 1;
-            $data['status'] = 2;
-        }
-
         $id = $this->m_office_room->addRoom($data, $agent_id);
 
         if ($id > 0) {