mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#I90ZU9，优化客户列表的搜索条件，修复：下属客户中出现自己的客户信息的bug

Browse Source
This commit is contained in:
HDM58\hdm58 2024-03-08 10:36:40 +08:00
parent eed5c59773
commit 3558dac3cd
1 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
app/customer/controller/Index.php
View File

@ -23,6 +23,10 @@ class Index extends BaseController
if (request()->isAjax()) { if (request()->isAjax()) {
$param = get_params(); $param = get_params();
$tab = isset($param['tab']) ? $param['tab'] : 0; $tab = isset($param['tab']) ? $param['tab'] : 0;
$belong_uid = isset($param['uid']) ? $param['uid'] : 0;
$uid = $this->uid;
$auth = isAuth($uid,'customer_admin');
$dids = get_department_role($uid);
$where = array(); $where = array();
$whereOr = array(); $whereOr = array();
if (!empty($param['keywords'])) { if (!empty($param['keywords'])) {
@ -48,60 +52,41 @@ class Index extends BaseController
$next_time =explode('~', $param['next_time']); $next_time =explode('~', $param['next_time']);
$where[] = ['ct.next_time', 'between', [strtotime(urldecode($next_time[0])),strtotime(urldecode($next_time[1]))]]; $where[] = ['ct.next_time', 'between', [strtotime(urldecode($next_time[0])),strtotime(urldecode($next_time[1]))]];
} }
$where[] = ['a.delete_time', '=', 0]; $where[] = ['a.delete_time', '=', 0];
if($tab == 0){
$uid = $this->uid; if($auth == 1){
$auth = isAuth($uid,'customer_admin'); if($belong_uid>0 ){
if (!empty($param['uid']) && $auth == 1) { $where[] =['a.belong_uid', '=', $belong_uid];
$where[] =['a.belong_uid', '=', $param['uid']];
} }
else{ else{
$dids = get_department_role($uid); $where[] =['a.belong_uid', '>',0];
if($auth == 0){
if($tab == 1){
$whereOr[] =['a.belong_uid', '=', $uid];
} }
else if($tab == 2){ }
else{
//属于我的
$whereOr[] =['a.belong_uid', '=', $uid];
//共享给我的
$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
//我的下属的
if(!empty($dids)){ if(!empty($dids)){
$whereOr[] =['a.belong_did', 'in', $dids]; $whereOr[] =['a.belong_did', 'in', $dids];
} }
}
}
else if($tab == 1){
$where[] =['a.belong_uid', '=', $uid];
}
else if($tab == 2){
if(!empty($dids)){
$where[] =['a.belong_did', 'in', $dids];
}
else{ else{
$whereOr[] =['a.belong_did', '=', 0]; $where[] =['a.belong_did', '=', 0];
$where[] =['a.belong_uid', '>', 0]; $where[] =['a.belong_uid', '>', 0];
} }
} }
else if($tab == 3){ else if($tab == 3){
$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")]; $where[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
}
else{
$whereOr[] =['a.belong_uid', '=', $uid];
if(!empty($dids)){
$whereOr[] =['a.belong_did', 'in', $dids];
}
$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
}
}
else if($auth ==1 ){
if($tab == 1){
$whereOr[] =['a.belong_uid', '=', $uid];
}
else if($tab == 2){
if(!empty($dids)){
$whereOr[] =['a.belong_did', 'in', $dids];
}
else{
$whereOr[] =['a.belong_did', '=', 0];
$where[] =['a.belong_uid', '>', 0];
}
}
else if($tab == 3){
$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
}
else{
$whereOr[] =['a.belong_uid', '>', 0];
}
}
} }
$cc_sql= Db::name('CustomerContact')->group('cid,name,mobile,qq,wechat,email')->field('cid,name,mobile,qq,wechat,email')->buildSql(); $cc_sql= Db::name('CustomerContact')->group('cid,name,mobile,qq,wechat,email')->field('cid,name,mobile,qq,wechat,email')->buildSql();
$ct_sql= Db::name('CustomerTrace')->group('cid')->field('cid,MAX(follow_time) AS follow_time,MAX(next_time) AS next_time')->buildSql(); $ct_sql= Db::name('CustomerTrace')->group('cid')->field('cid,MAX(follow_time) AS follow_time,MAX(next_time) AS next_time')->buildSql();
@ -112,7 +97,9 @@ class Index extends BaseController
$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
$content = CustomerList::where($where) $content = CustomerList::where($where)
->where(function ($query) use($whereOr) { ->where(function ($query) use($whereOr) {
if (!empty($whereOr)){
$query->whereOr($whereOr); $query->whereOr($whereOr);
}
}) })
->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry,ct.follow_time,ct.next_time') ->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry,ct.follow_time,ct.next_time')
->alias('a') ->alias('a')