Commit ed4808a2 authored by clone's avatar clone

Merge branch '0813-v3.3.7' of https://gitee.com/zwyjjc/tl_estate into 0813-v3.3.7

parents d7d0308b 21ca1dec
...@@ -73,7 +73,6 @@ class Transfer extends Basic ...@@ -73,7 +73,6 @@ class Transfer extends Basic
} }
$where['a.city'] = $this->city; $where['a.city'] = $this->city;
$where['d.site_id'] = $this->siteId;
if (!empty($params['agent_id'])) { if (!empty($params['agent_id'])) {
$where['d.agent_id'] = $params['agent_id']; $where['d.agent_id'] = $params['agent_id'];
}else{ }else{
...@@ -81,6 +80,7 @@ class Transfer extends Basic ...@@ -81,6 +80,7 @@ class Transfer extends Basic
if (is_numeric($params['agent_type'])) { if (is_numeric($params['agent_type'])) {
if($params['agent_type'] == 1){ if($params['agent_type'] == 1){
$where['c.agent_id'] = array('gt',0); $where['c.agent_id'] = array('gt',0);
$where['d.site_id'] = $this->siteId;
}else{ }else{
$where[] = ['EXP', 'c.agent_id IS NULL OR c.agent_id = 0']; $where[] = ['EXP', 'c.agent_id IS NULL OR c.agent_id = 0'];
} }
......
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