Commit 39d2b788 authored by zhuwei's avatar zhuwei

app 客户 like 站点

parent a387f2f7
...@@ -153,6 +153,8 @@ class User extends Basic ...@@ -153,6 +153,8 @@ class User extends Basic
$user_id_str = $this->getUserIDList($params['agent_id']); $user_id_str = $this->getUserIDList($params['agent_id']);
$conditions['a.id'] = ['in', $user_id_str]; $conditions['a.id'] = ['in', $user_id_str];
// $conditions['a.id'] = $params['agent_id'];
if (isset($params['user_status'])) { if (isset($params['user_status'])) {
$conditions['a.user_status'] = $params['user_status']; $conditions['a.user_status'] = $params['user_status'];
} }
...@@ -237,12 +239,11 @@ class User extends Basic ...@@ -237,12 +239,11 @@ class User extends Basic
} }
if (isset($params['site_id']) ) { if (isset($params['site_id']) ) {
$conditions['s.site_id'] = $params['site_id']; $conditions['a.site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
}else{ }else{
$conditions['s.site_id'] = $this->siteId; $conditions['a.site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
} }
//委托类型 //委托类型
if(isset($params['entrust_type']) && is_numeric($params['entrust_type'])){ if(isset($params['entrust_type']) && is_numeric($params['entrust_type'])){
$conditions['a.entrust_type'] =$params['entrust_type']; $conditions['a.entrust_type'] =$params['entrust_type'];
......
...@@ -694,11 +694,11 @@ class Users extends Model ...@@ -694,11 +694,11 @@ class Users extends Model
*/ */
public function selectUserList($field, $params, $pageNo, $pageSize, $order) public function selectUserList($field, $params, $pageNo, $pageSize, $order)
{ {
$params['s.is_del'] = 0; // $params['s.is_del'] = 0;
$result = Db::table($this->table) $result = Db::table($this->table)
->field($field) ->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($params) ->where($params)
->order($order) ->order($order)
->page($pageNo) ->page($pageNo)
......
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