|
@@ -269,7 +269,26 @@ class EmployeeService extends Service
|
|
|
->where('employee_id',$user['id'])
|
|
|
->select('employee_id','index','index_2','index_3','type','start_time','end_time')
|
|
|
->get()->toArray();
|
|
|
- $user['detail'] = $detail;
|
|
|
+ $user['index_array'] = $detail;
|
|
|
+ $res = DB::table('employee_role as a')
|
|
|
+ ->leftJoin('role as b','a.role_id','=','b.id')
|
|
|
+ ->where('a.del_time',0)
|
|
|
+ ->where('b.del_time',0)
|
|
|
+ ->where("a.employee_id",$user['id'])
|
|
|
+ ->select('a.employee_id','b.title','b.id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $role_name = "";
|
|
|
+ $role = [];
|
|
|
+ foreach ($res as $value){
|
|
|
+ if(empty($role_name)){
|
|
|
+ $role_name = $value->title;
|
|
|
+ }else{
|
|
|
+ $role_name .= ',' . $value->title;
|
|
|
+ }
|
|
|
+ $role[] = $value->id;
|
|
|
+ }
|
|
|
+ $res['role'] = $role;
|
|
|
+ $res['role_name'] = $role_name;
|
|
|
|
|
|
return [true, $user];
|
|
|
}
|