Commit 3b008878 authored by clone's avatar clone

bug

parent d9a2df94
...@@ -623,7 +623,7 @@ class PerformanceService ...@@ -623,7 +623,7 @@ class PerformanceService
$params = $this->getAgentId($agent_id, 2, $start_time, $end_time); $params = $this->getAgentId($agent_id, 2, $start_time, $end_time);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,a.user_name,a.user_phone,a.predict_see_time,b.house_title"; $field = "a.id,a.user_name,a.user_phone,a.predict_see_time,c.internal_title as house_title,c.shop_type";
$reportList = $this->reportModel->getAddReportList($params, $field, $page_no, $page_size); $reportList = $this->reportModel->getAddReportList($params, $field, $page_no, $page_size);
foreach ($reportList as $key => $val) { foreach ($reportList as $key => $val) {
$reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
......
...@@ -395,6 +395,7 @@ class OReportModel extends Model ...@@ -395,6 +395,7 @@ class OReportModel extends Model
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.id = b.f_id", "left") ->join("o_order b", "a.id = b.f_id", "left")
->join("g_houses c", "b.house_id = c.id", "left")
->where($where_) ->where($where_)
->limit($page_size) ->limit($page_size)
->page($page_no) ->page($page_no)
......
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