From 3558dac3cda82742d62621e41dfe40744e373e09 Mon Sep 17 00:00:00 2001
From: "HDM58\\hdm58" <hdm58@qq.com>
Date: Fri, 8 Mar 2024 10:36:40 +0800
Subject: [PATCH] =?UTF-8?q?#I90ZU9=EF=BC=8C=E4=BC=98=E5=8C=96=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B8=8B=E5=B1=9E?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=AD=E5=87=BA=E7=8E=B0=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/customer/controller/Index.php | 91 +++++++++++++------------------
 1 file changed, 39 insertions(+), 52 deletions(-)

diff --git a/app/customer/controller/Index.php b/app/customer/controller/Index.php
index bafc0ac..dc6aafe 100644
--- a/app/customer/controller/Index.php
+++ b/app/customer/controller/Index.php
@@ -23,6 +23,10 @@ class Index extends BaseController
         if (request()->isAjax()) {
             $param = get_params();
 			$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();
             $whereOr = array();
             if (!empty($param['keywords'])) {
@@ -47,62 +51,43 @@ class Index extends BaseController
 			if (!empty($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[] = ['a.delete_time', '=', 0];
-			
-			$uid = $this->uid;
-			$auth = isAuth($uid,'customer_admin');
-			if (!empty($param['uid']) && $auth == 1) {
-				$where[] =['a.belong_uid', '=', $param['uid']];	
+			if($tab == 0){
+				if($auth == 1){
+					if($belong_uid>0 ){
+						$where[] =['a.belong_uid', '=', $belong_uid];
+					}
+					else{
+						$where[] =['a.belong_uid', '>',0];
+					}
+				}
+				else{
+					//属于我的
+					$whereOr[] =['a.belong_uid', '=', $uid];
+					//共享给我的
+					$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
+					//我的下属的
+					if(!empty($dids)){
+						$whereOr[] =['a.belong_did', 'in', $dids];
+					}					
+				}
 			}
-			else{
-				$dids = get_department_role($uid);
-				if($auth == 0){
-					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', '=', $uid];	
-						if(!empty($dids)){
-							$whereOr[] =['a.belong_did', 'in', $dids];
-						}			
-						$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
-					}
+			else if($tab == 1){
+				$where[] =['a.belong_uid', '=', $uid];
+			}
+			else if($tab == 2){
+				if(!empty($dids)){
+					$where[] =['a.belong_did', 'in', $dids];
 				}
-				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];
-					}
+				else{
+					$where[] =['a.belong_did', '=', 0];
+					$where[] =['a.belong_uid', '>', 0];
 				}
 			}
+			else if($tab == 3){
+				$where[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',a.share_ids)")];
+			}
 			$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();
 			$orderby = 'ct.next_time desc,a.create_time desc';
@@ -112,7 +97,9 @@ class Index extends BaseController
             $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
             $content = CustomerList::where($where)
 				->where(function ($query) use($whereOr) {
-					$query->whereOr($whereOr);
+					if (!empty($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')
                 ->alias('a')