|
|
@ -12,8 +12,10 @@ |
|
|
namespace app\service\api\apiService; |
|
|
namespace app\service\api\apiService; |
|
|
|
|
|
|
|
|
use app\model\campus_person_role\CampusPersonRole; |
|
|
use app\model\campus_person_role\CampusPersonRole; |
|
|
|
|
|
use app\model\departments\Departments; |
|
|
use app\model\member\Member; |
|
|
use app\model\member\Member; |
|
|
use app\model\personnel\Personnel; |
|
|
use app\model\personnel\Personnel; |
|
|
|
|
|
use app\model\sys\SysRole; |
|
|
use app\service\core\member\CoreMemberService; |
|
|
use app\service\core\member\CoreMemberService; |
|
|
use core\base\BaseApiService; |
|
|
use core\base\BaseApiService; |
|
|
use core\exception\ApiException; |
|
|
use core\exception\ApiException; |
|
|
@ -43,16 +45,26 @@ class PersonnelService extends BaseApiService |
|
|
|
|
|
|
|
|
//查询部门信息 |
|
|
//查询部门信息 |
|
|
$campus_person_role = CampusPersonRole::where('person_id',$where['id'])->select()->toArray(); |
|
|
$campus_person_role = CampusPersonRole::where('person_id',$where['id'])->select()->toArray(); |
|
|
$role_id = array_column($campus_person_role, 'role_id'); |
|
|
$role_id = array_unique(array_column($campus_person_role, 'role_id')); |
|
|
$dept_id = array_column($campus_person_role, 'dept_id'); |
|
|
$dept_id = array_unique(array_column($campus_person_role, 'dept_id')); |
|
|
|
|
|
//查询用户角色 |
|
|
|
|
|
$role_name_arr = SysRole::whereIn('role_id',$role_id)->column('role_name'); |
|
|
|
|
|
$role_name_str = implode(',',$role_name_arr);// |
|
|
|
|
|
|
|
|
|
|
|
//查询部门 |
|
|
|
|
|
$department_name_arr = Departments::whereIn('id',$dept_id)->column('department_name'); |
|
|
|
|
|
$department_name_str = implode(',',$department_name_arr); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if($res){ |
|
|
if($res){ |
|
|
$res = $res->toArray(); |
|
|
$res = $res->toArray(); |
|
|
|
|
|
$res['role_name_str'] = $role_name_str; |
|
|
|
|
|
$res['department_name_str'] = $department_name_str; |
|
|
|
|
|
|
|
|
}else{ |
|
|
}else{ |
|
|
$res = []; |
|
|
$res = []; |
|
|
return $res; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
return $res; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|