Commit e0c0bfa8 authored by clone's avatar clone

1

parent 9c8cc4e2
...@@ -175,7 +175,7 @@ class OfficeRoomApiService ...@@ -175,7 +175,7 @@ class OfficeRoomApiService
$ids = ""; $ids = "";
if (count($buildingArr) > 0) { if (count($buildingArr) > 0) {
foreach ($buildingArr as $item) { foreach ($buildingArr as $item) {
$ids .= $item["id"] . ","; $ids .= $item["building_id"] . ",";
} }
$ids = rtrim($ids, ","); $ids = rtrim($ids, ",");
} }
......
...@@ -1356,11 +1356,10 @@ class OfficeRoomService ...@@ -1356,11 +1356,10 @@ class OfficeRoomService
$field = "building_id,stations_id"; $field = "building_id,stations_id";
$params["stations_id"] = array("in", $stations_str); $params["stations_id"] = array("in", $stations_str);
$buildingArr = $buildingStationsModel->getBuilderByStations($field, $params); $buildingArr = $buildingStationsModel->getBuilderByStations($field, $params);
$ids = ""; $ids = "";
if (count($buildingArr) > 0) { if (count($buildingArr) > 0) {
foreach ($buildingArr as $item) { foreach ($buildingArr as $item) {
$ids .= $item["id"] . ","; $ids .= $item["building_id"] . ",";
} }
$ids = rtrim($ids, ","); $ids = rtrim($ids, ",");
} }
......
...@@ -425,7 +425,7 @@ class OfficeGRoom extends BaseModel ...@@ -425,7 +425,7 @@ class OfficeGRoom extends BaseModel
public function getRoomBuilding($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '') public function getRoomBuilding($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '')
{ {
$params['b.is_del'] = 0; $params['b.is_del'] = 0;
return $this->field($field) $result = $this->field($field)
->alias('a') ->alias('a')
->join('office_g_building b', 'a.building_id = b.id', 'left') ->join('office_g_building b', 'a.building_id = b.id', 'left')
->join('g_business_district c', 'b.business_district_id = c.id', 'left') ->join('g_business_district c', 'b.business_district_id = c.id', 'left')
...@@ -434,6 +434,8 @@ class OfficeGRoom extends BaseModel ...@@ -434,6 +434,8 @@ class OfficeGRoom extends BaseModel
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
//echo $this->getLastSql();
return $result;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment