|
@@ -214,17 +214,14 @@ class Pub extends BaseController
|
|
|
['page', 1],
|
|
['page', 1],
|
|
|
['pageSize', 50],
|
|
['pageSize', 50],
|
|
|
['work_type_id', ""],
|
|
['work_type_id', ""],
|
|
|
|
|
+ ['is_type_audit',""],
|
|
|
|
|
+ ['ancestral_place'],
|
|
|
], $request);
|
|
], $request);
|
|
|
$post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
|
|
$post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
|
|
|
$post["page"] = $post["page"]<=0 ? 1 : (int)$post["page"];
|
|
$post["page"] = $post["page"]<=0 ? 1 : (int)$post["page"];
|
|
|
$post["status"] = 1;
|
|
$post["status"] = 1;
|
|
|
$data = (new UserModel)->getApiWorkerList($post);
|
|
$data = (new UserModel)->getApiWorkerList($post);
|
|
|
|
|
|
|
|
- foreach ($data['list'] as &$worker) {
|
|
|
|
|
- $user = User::where('uid', $worker['uid'])->first();
|
|
|
|
|
- $worker['is_type_audit'] = $user->is_type_audit;
|
|
|
|
|
- $worker['ancestral_place'] = $user->ancestral_place;
|
|
|
|
|
- }
|
|
|
|
|
return app('json')->success($data);
|
|
return app('json')->success($data);
|
|
|
}
|
|
}
|
|
|
|
|
|