|
|
@@ -291,11 +291,6 @@ class EmployeeService extends Service
|
|
|
->get()->toArray();
|
|
|
$employee_id = array_column($employee_id,'employee_id');
|
|
|
$model->whereIn("id", $employee_id);
|
|
|
- }else{
|
|
|
- if(! $user['is_all_depart'] && empty($data['is_top_qx'])){
|
|
|
- $employee_id = $this->getEmployee($user);
|
|
|
- $model->whereIn('id',$employee_id);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
if(! empty($data['number'])) $model->where('number', 'LIKE', '%'.$data['number'].'%');
|
|
|
@@ -373,19 +368,11 @@ class EmployeeService extends Service
|
|
|
$man_top_depart[$key] = array_values($value);
|
|
|
}
|
|
|
|
|
|
- $wx = WxEmployeeOfficial::where('appid',WeixinService::APPID)
|
|
|
- ->where('employee_id','>',0)
|
|
|
- ->select('employee_id')
|
|
|
- ->get()->toArray();
|
|
|
- $wx = array_column($wx,'employee_id');
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['role'] = $role2[$value['id']] ?? [];
|
|
|
$data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
|
|
|
$data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
|
|
|
$data['data'][$key]['depart_title'] = $depart_title[$value['id']] ?? '';
|
|
|
- $is_wx = "未绑定微信公众号";
|
|
|
- if(in_array($value['id'], $wx)) $is_wx = "已绑定微信公众号";
|
|
|
- $data['data'][$key]['is_wx'] = $is_wx;
|
|
|
$data['data'][$key]['my_top'] = $man_top_depart[$value['id']] ?? [];
|
|
|
}
|
|
|
|
cqp