Commit af399702 authored by zhuwei's avatar zhuwei

1

parent 48e5fdb8
......@@ -142,7 +142,7 @@ class AttentionShop extends Basic
return $this->response("101", "用户id不能为空");
}
$s_office_room = new OfficeRoomApiService();
$result = $s_office_room->attentionOfficeList($this->params);
$result = $s_office_room->attentionOfficeList($params);
if ($result['status'] == 'successful') {
return $this->response("200", "success",$result['data']);
......
......@@ -218,11 +218,13 @@ class OfficeRoomApiService
$m_attention = new AttentionModel();
$field = "b.id,c.disc,c.title,c.address,d.name as business_name,b.building_id,b.price,b.price_total,c.status,b.is_rent";
$params["a.type"] = 0;
$params_["a.type"] = 1;
$params_["a.is_del"] = 0;
$params_["a.user_id"] = $params["user_id"];
$order_ = 'a.create_time desc';
try {
$result = $m_attention->myOfficeAttentionList($pageNo, $pageSize, $order_, $field, $params);
$result = $m_attention->myOfficeAttentionList($pageNo, $pageSize, $order_, $field, $params_);
} catch (\Exception $e) {
$result['status'] = 'fail';
$result['msg'] = $e->getMessage();
......
......@@ -117,12 +117,11 @@ class AttentionModel extends Model
* @param int $pageSize
* @param string $order_
* @param $field
* @param $param
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function myOfficeAttentionList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $param)
public function myOfficeAttentionList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params)
{
$params["a.is_del"] = 0;
return $this->field($field)
->alias("a")
->join('office_g_room b', 'a.house_id = b.id', 'left')
......
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