1

application/api_broker/controller/User.php

@@ -246,9 +246,9 @@ class User extends Basic
                 }
 
                 if (isset($params['site_id']) ) {
-                    $conditions['s.site_id'] = $params['site_id'];
+                    $conditions['a.site_ids'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
                 }else{
-                    $conditions['s.site_id'] = $this->siteId;
+                    $conditions['a.site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
                 }
 
                 //委托类型

application/index/controller/Member.php

@@ -325,9 +325,9 @@ class Member extends Basic{
                 $check_data = $service_broker->checkSite($this->userId, $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 {
-                    $where['s.site_id'] = $this->siteId;
+                    $where['a.site_ids'] = [ 'LIKE', '%' . $this->siteId . '%' ];
                 }
             }
 
@@ -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,
             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';

application/model/Users.php

@@ -118,7 +118,7 @@ class Users extends Model
         if ($type == 1) {
             $result = $this->field($fields)
                 ->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)
                 ->order($order_)
                 ->limit($pageSize)
@@ -140,7 +140,7 @@ class Users extends Model
                 ->alias('a')
                 ->join("u_user_agent c","a.id = c.user_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)
                 ->order($order_)
                 ->limit($pageSize)
@@ -150,7 +150,7 @@ class Users extends Model
             $result = $this->field($fields)
                 ->alias('a')
                 ->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('a.referrer_source', 20)
                 ->order($order_)
@@ -160,7 +160,7 @@ class Users extends Model
         } else {
             $result = $this->field($fields)
                 ->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)
                 ->order($order_)
                 ->limit($pageSize)
@@ -694,11 +694,11 @@ class Users extends Model
      */
     public function selectUserList($field, $params, $pageNo, $pageSize, $order)
     {
-        $params['s.is_del'] = 0;
+        // $params['s.is_del'] = 0;
         $result = Db::table($this->table)
             ->field($field)
             ->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)
             ->order($order)
             ->page($pageNo)
@@ -708,30 +708,7 @@ class Users extends Model
         return $result;
     }
 
-    /**
-     * 我的客户
-     * @param $field
-     * @param $params
-     * @param $pageNo
-     * @param $pageSize
-     * @param $order
-     * @return false|\PDOStatement|string|\think\Collection
-     */
-    public function selectUserListGroup($field, $params, $pageNo, $pageSize, $order)
-    {
-        $result = Db::table($this->table)
-            ->field($field)
-            ->alias('a')
-            ->join("u_user_site s", "a.id=s.user_id", "right")
-            ->where($params)
-            ->order($order)
-            ->page($pageNo)
-            ->limit($pageSize)
-            ->group("a.id")
-            ->select();
-        // big_log($this->getLastSql());
-        return $result;
-    }
+
 
     /**
      * 我的客户
@@ -1018,7 +995,7 @@ class Users extends Model
         } else {
             $result = $this->field($field)
                 ->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)
                 ->order($order)
                 ->limit($limit)