Commit 96a3cf30 authored by hujun's avatar hujun

site_id

parent f6427d26
...@@ -43,10 +43,12 @@ class FindShop extends Basic ...@@ -43,10 +43,12 @@ class FindShop extends Basic
if ($params['is_my'] != 0 && $params['is_my'] != 1) { if ($params['is_my'] != 0 && $params['is_my'] != 1) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
$conditions['a.site_id'] = $this->siteId;
if ($params['is_my'] == 0 && empty($params['agent_id'])) { if ($params['is_my'] == 0 && empty($params['agent_id'])) {
return $this->response("101", "我的客户经纪人id不能为空"); return $this->response("101", "我的客户经纪人id不能为空");
}elseif($params['is_my'] == 0 && !empty($params['agent_id'])){ }elseif($params['is_my'] == 0 && !empty($params['agent_id'])){
$conditions["b.agent_id"] = $params['agent_id']; $conditions["b.agent_id"] = $params['agent_id'];
$conditions['c.site_id'] = $conditions['a.site_id'] = $this->siteId;
} }
if (isset($params['submit_time_start']) && isset($params['submit_time_end'])) { if (isset($params['submit_time_start']) && isset($params['submit_time_end'])) {
$submit_time_start = $params['submit_time_start']; $submit_time_start = $params['submit_time_start'];
......
...@@ -79,6 +79,7 @@ class WatchShop extends Basic ...@@ -79,6 +79,7 @@ class WatchShop extends Basic
if ($params['check_status'] == 2) { if ($params['check_status'] == 2) {
$where['a.appoint_agent_id'] = $this->userId; $where['a.appoint_agent_id'] = $this->userId;
$where['d.site_id'] = $this->siteId;
$data['list'] = $applies->getAppointWatchOurList($pageNo, $pageSize, 'id DESC', 'a.*', $where); $data['list'] = $applies->getAppointWatchOurList($pageNo, $pageSize, 'id DESC', 'a.*', $where);
$data['total'] = $applies->getAppointWatchOurTotal($where); $data['total'] = $applies->getAppointWatchOurTotal($where);
} }
......
...@@ -53,10 +53,11 @@ class UFindShop extends Model{ ...@@ -53,10 +53,11 @@ class UFindShop extends Model{
$params["a.status"] = 0; $params["a.status"] = 0;
return $this->db_ return $this->db_
->alias("a") ->alias("a")
->join("u_users b","a.user_id = b.id","left") ->join("u_user_agent c","a.user_id = c.user_id","left")
->join("u_users b","c.user_id = b.id","left")
->field($field) ->field($field)
->where($params) ->where($params)
->order("id desc") ->order("a.id desc")
->page($page_no) ->page($page_no)
->limit($page_size) ->limit($page_size)
->select(); ->select();
...@@ -66,7 +67,8 @@ class UFindShop extends Model{ ...@@ -66,7 +67,8 @@ class UFindShop extends Model{
$params["a.status"] = 0; $params["a.status"] = 0;
return $this->db_ return $this->db_
->alias("a") ->alias("a")
->join("u_users b","a.user_id = b.id","left") ->join("u_user_agent c","a.user_id = c.user_id","left")
->join("u_users b","c.user_id = b.id","left")
->field($field) ->field($field)
->where($params) ->where($params)
->count(); ->count();
......
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