新增客户列表

application/api_broker/service/PerformanceService.php

@@ -456,6 +456,8 @@ class PerformanceService
     private function getAgentIdPcInfo($id, $type, $start_time, $end_time)
     {
 
+
+
         switch ($type) {
             case 1:
                 $params["agent_id"] = $id;
@@ -524,7 +526,7 @@ class PerformanceService
         $params = $this->getAgentId($agent_id, $type, $start_time, $end_time);
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
-        $field       = "id,user_name,user_phone,user_nick,create_time,agent_id";
+        $field       = "a.id,a.user_name,a.user_phone,a.user_nick,a.create_time,a.agent_id";
         $addUserList = $this->userModel->getAddUserList($params, $field, $page_no, $page_size);
         foreach ($addUserList as $key => $val) {
             if ($val["agent_id"] == $agent_id) {
@@ -747,7 +749,7 @@ class PerformanceService
         $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
-        $field       = "id,user_name,user_phone,user_nick,create_time,agent_id,user_status,source,industry_type,area_demand";
+        $field       = "a.id,a.user_name,a.user_phone,a.user_nick,a.create_time,a.agent_id,a.user_status,a.source,a.industry_type,a.area_demand,b.name";
         $addUserList = $this->userModel->getAddUserList($params, $field, $page_no, $page_size);
         foreach ($addUserList as $key => $val) {
             if ($val["agent_id"] == $id) {

application/model/Users.php

@@ -599,18 +599,20 @@ class Users extends Model
     {
         $where_ = [];
         if (isset($params["agent_id"])) {
-            $where_["agent_id"] = $params["agent_id"];
+            $where_["a.agent_id"] = $params["agent_id"];
         }
         if (isset($params["create_time"])) {
-            $where_["create_time"] = $params["create_time"];
+            $where_["a.create_time"] = $params["create_time"];
         }
         $result = Db::table($this->table)
             ->field($field)
+            ->alias("a")
+            ->join("a_agents b", "a.agent_id=b.id", "left")
             ->where($where_)
             ->limit($page_size)
             ->page($page_no)
             ->select();
-        //echo Db::table($this->table)->getLastSql();
+//        echo Db::table($this->table)->getLastSql();
         return $result;
     }