|
|
@ -518,12 +518,6 @@ public function actionDownload(){ |
|
|
|
|
|
|
|
|
|
|
|
$user_id = 0; |
|
|
|
$user_id = 0; |
|
|
|
|
|
|
|
|
|
|
|
if($company_type == 1){ |
|
|
|
|
|
|
|
$company_id=2; |
|
|
|
|
|
|
|
}elseif ($company_type == 2){ |
|
|
|
|
|
|
|
$company_id=3; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$query = UserT::find() |
|
|
|
$query = UserT::find() |
|
|
|
->rightJoin('network_phone_assign_t','`network_phone_assign_t`.`user_id`=`user_t`.`id`'); |
|
|
|
->rightJoin('network_phone_assign_t','`network_phone_assign_t`.`user_id`=`user_t`.`id`'); |
|
|
|
|
|
|
|
|
|
|
@ -535,9 +529,6 @@ public function actionDownload(){ |
|
|
|
if($caller != ''){ |
|
|
|
if($caller != ''){ |
|
|
|
$query->andWhere('user_t.username="'.$caller.'"'); |
|
|
|
$query->andWhere('user_t.username="'.$caller.'"'); |
|
|
|
} |
|
|
|
} |
|
|
|
if($company_id > 0) { |
|
|
|
|
|
|
|
$query->andWhere('user_t.company_id='.$company_id); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$query->andWhere('user_t.is_delete=0 and user_t.is_leave=0')->orderBy('user_t.username'); |
|
|
|
$query->andWhere('user_t.is_delete=0 and user_t.is_leave=0')->orderBy('user_t.username'); |
|
|
|
|
|
|
|
|
|
|
|