Commit fbd42b1d authored by clone's avatar clone

bug

parent c8bc7676
...@@ -60,7 +60,7 @@ class Bargain extends Basic ...@@ -60,7 +60,7 @@ class Bargain extends Basic
$agent_res = $this->agentModel->getAgentsInfoByAgentId($agent_field, [ "agent_id" => $submit_agent_id ]); $agent_res = $this->agentModel->getAgentsInfoByAgentId($agent_field, [ "agent_id" => $submit_agent_id ]);
if(($agent_res[0]['level'] == 10) && ($is_my_correlation == 0)){ if(($agent_res[0]['level'] == 10) && ($is_my_correlation == 0)){
return $this->response("200", "暂无权限!"); return $this->response("101", "暂无权限!");
} }
/*业务员不允许点击查看全部成交报告 end*/ /*业务员不允许点击查看全部成交报告 end*/
......
...@@ -1370,8 +1370,8 @@ class OrderLogService ...@@ -1370,8 +1370,8 @@ class OrderLogService
$params["ids"] = $ids; $params["ids"] = $ids;
$bargainModel = new OBargainModel(); $bargainModel = new OBargainModel();
$filed = "a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id, $filed = "a.id,a.father_id,a.house_number,a.price,a.commission,a.agent_id,a.create_time,b.user_phone,
d.id as house_id,d.internal_title,d.internal_address"; b.user_name,b.user_id,c.id as order_id,c.order_no,d.id as house_id,d.internal_title,d.internal_address,b.id as report_id";
$result = $bargainModel->selectBargainList($filed, $params, $pageNo, $pageSize); $result = $bargainModel->selectBargainList($filed, $params, $pageNo, $pageSize);
$list = []; $list = [];
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
......
...@@ -257,7 +257,7 @@ class OBargainModel extends Model ...@@ -257,7 +257,7 @@ class OBargainModel extends Model
$where_["a.father_id"] = $params["father_id"]; $where_["a.father_id"] = $params["father_id"];
} }
if (!isset($params["type"]) && isset($params["keyword"])) { if (!isset($params["type"]) && isset($params["keyword"])) {
$where_["b.user_phone|b.user_name|d.internal_address"] = array( "like", "%" . $params["keyword"] . "%" ); $where_["b.user_phone|b.user_name|d.internal_address"] = array( "like", "%" . $params["keyword"] . "%" );
} }
......
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