Commit d0858ce0 authored by zhuwei's avatar zhuwei

后台

parent 39d2b788
...@@ -594,9 +594,9 @@ class User extends Basic ...@@ -594,9 +594,9 @@ class User extends Basic
} }
if ( !empty($this->params['site_id'])) { if ( !empty($this->params['site_id'])) {
$where['s.site_id'] = $this->params['site_id']; $where['a.site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
} else { } else {
$where['s.site_id'] = $this->siteId; $where['a.site_ids'] = [ 'LIKE', '%' . $params . '%' ];
} }
if(isset($params['entrust_type']) && is_numeric($params['entrust_type'])){ if(isset($params['entrust_type']) && is_numeric($params['entrust_type'])){
......
...@@ -325,9 +325,9 @@ class Member extends Basic{ ...@@ -325,9 +325,9 @@ class Member extends Basic{
$check_data = $service_broker->checkSite($this->userId, $this->params['site_id']); $check_data = $service_broker->checkSite($this->userId, $this->params['site_id']);
if ($check_data && !empty($this->params['site_id'])) { if ($check_data && !empty($this->params['site_id'])) {
$where['s.site_id'] = $this->params['site_id']; $where['a.site_ids'] = [ 'LIKE', '%' . $this->params['site_id'] . '%' ];
} else { } else {
$where['s.site_id'] = $this->siteId; $where['a.site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
} }
} }
...@@ -356,7 +356,6 @@ class Member extends Basic{ ...@@ -356,7 +356,6 @@ class Member extends Basic{
} }
$where['s.is_del'] = 0;
$fields = 'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd, $fields = 'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,
a.referrer_id,a.user_label,a.user_name,a.status,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand a.referrer_id,a.user_label,a.user_name,a.status,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand
,a.user_status,a.source,a.entrust_type,a.concrete_industry'; ,a.user_status,a.source,a.entrust_type,a.concrete_industry';
......
...@@ -118,7 +118,7 @@ class Users extends Model ...@@ -118,7 +118,7 @@ class Users extends Model
if ($type == 1) { if ($type == 1) {
$result = $this->field($fields) $result = $this->field($fields)
->alias('a') ->alias('a')
->join("u_user_site s", "a.id=s.user_id", "right") // ->join("u_user_site s", "a.id=s.user_id", "right")
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -140,7 +140,7 @@ class Users extends Model ...@@ -140,7 +140,7 @@ class Users extends Model
->alias('a') ->alias('a')
->join("u_user_agent c","a.id = c.user_id","left") ->join("u_user_agent c","a.id = c.user_id","left")
->join('a_agents b', 'c.agent_id = b.id', 'left') ->join('a_agents b', 'c.agent_id = b.id', 'left')
->join("u_user_site s", "a.id=s.user_id", "right") // ->join("u_user_site s", "a.id=s.user_id", "right")
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -150,7 +150,7 @@ class Users extends Model ...@@ -150,7 +150,7 @@ class Users extends Model
$result = $this->field($fields) $result = $this->field($fields)
->alias('a') ->alias('a')
->join('a_agents b', 'a.referrer_id = b.id', 'left') ->join('a_agents b', 'a.referrer_id = b.id', 'left')
->join("u_user_site s", "a.id=s.user_id", "right") // ->join("u_user_site s", "a.id=s.user_id", "right")
->where($params) ->where($params)
->where('a.referrer_source', 20) ->where('a.referrer_source', 20)
->order($order_) ->order($order_)
...@@ -160,7 +160,7 @@ class Users extends Model ...@@ -160,7 +160,7 @@ class Users extends Model
} else { } else {
$result = $this->field($fields) $result = $this->field($fields)
->alias('a') ->alias('a')
->join("u_user_site s", "a.id=s.user_id", "right") // ->join("u_user_site s", "a.id=s.user_id", "right")
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -1018,7 +1018,7 @@ class Users extends Model ...@@ -1018,7 +1018,7 @@ class Users extends Model
} else { } else {
$result = $this->field($field) $result = $this->field($field)
->alias('a') ->alias('a')
->join("u_user_site s", "a.id=s.user_id", "right") // ->join("u_user_site s", "a.id=s.user_id", "right")
->where($where) ->where($where)
->order($order) ->order($order)
->limit($limit) ->limit($limit)
......
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