冲突2

application/api_broker/controller/Client.php

@@ -145,7 +145,7 @@ class Client extends Basic
 
         $order="id desc";
         $data['list']=$table->getAgentUserTb($pageNo, $pageSize,$order,$field, $where);
-        $total=$table->getUserAgentTotal($where);
+        $total=$table->getMyUserCount($where);
         $data['total']= ceil($total / $pageSize);
         $data['page']=$pageNo;
         return $this->response(200,'成功',$data);

application/model/Agents.php

@@ -122,6 +122,10 @@ class Agents extends Model
         return $data;
     }
 
+
+
+
+
     /**
      * 查询经纪人列表
      *

application/model/Users.php

@@ -32,6 +32,15 @@ class Users extends Model
         }
         return $data;
     }
+
+    /**
+     * @param $param
+     * @param string $fields
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
     public function getUserByWhere($param, $fields = 'id,user_phone')
     {
         $data = $this
@@ -104,9 +113,11 @@ class Users extends Model
 
     /**
      * 获取查询用户和经纪人总数
-     *
      * @param $params
-     * @return mixed
+     * @return int|string
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getUserAgentTotal($params) {
         if ($params['invite']) {
@@ -126,6 +137,18 @@ class Users extends Model
     }
 
 
+    /**
+     * @param $params
+     * @return int|string
+     */
+    public  function  getMyUserCount($params){
+        $result = $this->alias('a')
+            ->where($params)
+            ->count();
+        return $result;
+    }
+
+
     /**
      * 删除用户
      *
@@ -231,6 +254,13 @@ class Users extends Model
         return $r;
     }
 
+    /**
+     * @param $user_id
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
     public function useraction_search_user_res($user_id)
     {
         return db('u_users')