Commit 97a03495 authored by hujun's avatar hujun

1

parent dcc859d3
...@@ -1986,7 +1986,7 @@ class OfficePayLog extends Basic ...@@ -1986,7 +1986,7 @@ class OfficePayLog extends Basic
} }
if (!empty($this->params['address'])) { if (!empty($this->params['address'])) {
$house_id = $m_house->getHouseColumn('id', ['internal_address' => ['LIKE', '%' . trim($this->params['address']) . '%']]); $house_id = $m_house->getHouseColumn('a.id', ['internal_address' => ['LIKE', '%' . trim($this->params['address']) . '%']]);
if (isset($where['b.house_id'])) { if (isset($where['b.house_id'])) {
$house_id[] = $where['b.house_id']; $house_id[] = $where['b.house_id'];
...@@ -2054,7 +2054,7 @@ class OfficePayLog extends Basic ...@@ -2054,7 +2054,7 @@ class OfficePayLog extends Basic
if (isset($house_id)) { if (isset($house_id)) {
$house_id = array_unique($house_id); $house_id = array_unique($house_id);
$house_id = array_filter($house_id); $house_id = array_filter($house_id);
$house_data = $m_house->getHouseColumn('id,internal_address', ['id'=>['in', $house_id]]); $house_data = $m_house->getHouseColumn('a.id,b.address', ['a.id'=>['in', $house_id]]);
} else { } else {
$house_data = []; $house_data = [];
} }
......
...@@ -645,6 +645,7 @@ class PrivacyNumber ...@@ -645,6 +645,7 @@ class PrivacyNumber
* 释放不需要的号码 * 释放不需要的号码
*/ */
public function releasePhoneB() { public function releasePhoneB() {
set_time_limit(0);
if (empty($_GET['phone_x'])) { if (empty($_GET['phone_x'])) {
return Response::create(['code' => 101, 'msg' => '参数错误', 'data' => ''], 'json'); return Response::create(['code' => 101, 'msg' => '参数错误', 'data' => ''], 'json');
} }
......
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