|
@@ -20,6 +20,8 @@ use App\Model\Supplier;
|
|
use App\Model\SysMenu;
|
|
use App\Model\SysMenu;
|
|
use App\Model\SysMenuButton;
|
|
use App\Model\SysMenuButton;
|
|
use App\Model\Team;
|
|
use App\Model\Team;
|
|
|
|
+use App\Model\WxEmployeeOfficial;
|
|
|
|
+use App\Service\Weixin\WeixinService;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Hash;
|
|
use Illuminate\Support\Facades\Hash;
|
|
use Mockery\Exception;
|
|
use Mockery\Exception;
|
|
@@ -302,12 +304,21 @@ class EmployeeService extends Service
|
|
$depart_id[$value->employee_id][] = $value->id;
|
|
$depart_id[$value->employee_id][] = $value->id;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ $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){
|
|
foreach ($data['data'] as $key => $value){
|
|
$data['data'][$key]['role'] = $role2[$value['id']] ?? [];
|
|
$data['data'][$key]['role'] = $role2[$value['id']] ?? [];
|
|
$data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
|
|
$data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
|
|
$data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
|
|
$data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
|
|
$data['data'][$key]['depart_title'] = $depart_title[$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;
|
|
}
|
|
}
|
|
|
|
+
|
|
return $data;
|
|
return $data;
|
|
}
|
|
}
|
|
|
|
|