Commit 28fac317 authored by hujun's avatar hujun

error

parent e95419b9
......@@ -797,8 +797,8 @@ class OfficePayLog extends Basic
}
if ($v['house_id']) {
$house_data = $m_house->getRoomInfo('a.id,b.address', ['a.id'=>$v['house_id']]);
$list[$k]['house_id'] = $house_data['id'];
$list[$k]['address'] = $house_data['address'];
$list[$k]['house_id'] = $house_data[0]['id'];
$list[$k]['address'] = $house_data[0]['address'];
} else {
$list[$k]['house_id'] = '';
$list[$k]['address'] = '';
......
......@@ -1636,7 +1636,7 @@ class OfficeRoomService
if (!empty($remark)) {
$m_operating = new OfficeGOperatingRecord();
$m_operating->record($agent_id, 2, $remark, $data['id']);
$m_operating->record($agent_id, 2, implode(',',$remark), $data['id']);
}
return ;
......
......@@ -542,7 +542,7 @@ class OfficeOPayLogModel extends Model
public function getOrderHouse($field, $where) {
return $this->db_->alias('a')
->field($field)
->join('o_order b', 'a.order_id=b.id', 'left')
->join('office_o_order b', 'a.order_id=b.id', 'left')
->join('office_g_room c', 'b.house_id=c.id', 'left')
->join('office_g_building d', 'c.building_id=d.id', 'left')
->where($where)
......
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