Commit 1b126d23 authored by zhuwei's avatar zhuwei

bug

parent 6394a280
...@@ -114,7 +114,6 @@ class Bargain extends Basic ...@@ -114,7 +114,6 @@ class Bargain extends Basic
public function bargainListSearchBargainId() public function bargainListSearchBargainId()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"submit_agent_id" => 93, "submit_agent_id" => 93,
"status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销 "status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销
...@@ -142,7 +141,7 @@ class Bargain extends Basic ...@@ -142,7 +141,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("101", "暂无权限!"); return $this->response("101", "暂无权限!2");
} }
/*业务员不允许点击查看全部成交报告 end*/ /*业务员不允许点击查看全部成交报告 end*/
......
...@@ -51,11 +51,10 @@ class BargainService ...@@ -51,11 +51,10 @@ class BargainService
$condition["status"] = 21; $condition["status"] = 21;
break; break;
case 5://调账->搜成交报告 不包括 待撤销和已撤销 case 5://调账->搜成交报告 不包括 待撤销和已撤销
$condition["status"] = array('neq','20,21'); $condition["status"] = array('not in','20,21');
break; break;
default: default:
} }
if (!empty($keyword)) { if (!empty($keyword)) {
$condition["keyword"] = $keyword; $condition["keyword"] = $keyword;
} }
......
...@@ -297,6 +297,8 @@ class OBargainModel extends Model ...@@ -297,6 +297,8 @@ class OBargainModel extends Model
->page($pageNo) ->page($pageNo)
->select(); ->select();
//echo $this->db_->getLastSql(); //echo $this->db_->getLastSql();
// dump($this->db_->getLastSql());exit;
return $result; return $result;
} }
......
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