|
|
@@ -2249,13 +2249,13 @@ class NewsController extends AbstractController
|
|
|
$requireData,
|
|
|
[
|
|
|
'page' => 'required|integer',
|
|
|
- 'limit' => 'required|integer',
|
|
|
+ 'page_size' => 'required|integer',
|
|
|
],
|
|
|
[
|
|
|
'page.required' => 'page不能为空',
|
|
|
'page.integer' => 'page必须是整数',
|
|
|
- 'limit.required' => 'limit不能为空',
|
|
|
- 'limit.integer' => 'limit必须是整数',
|
|
|
+ 'page_size.required' => 'page_size不能为空',
|
|
|
+ 'page_size.integer' => 'page_size必须是整数',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
@@ -2263,6 +2263,8 @@ class NewsController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get('UserId');
|
|
|
+ //type_id
|
|
|
+ $requireData['type_id'] = Context::get('TypeId');
|
|
|
$result = $this->newsServiceClient->noticeList($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
@@ -2273,13 +2275,13 @@ class NewsController extends AbstractController
|
|
|
$requireData,
|
|
|
[
|
|
|
'page' => 'required|integer',
|
|
|
- 'limit' => 'required|integer',
|
|
|
+ 'page_size' => 'required|integer',
|
|
|
],
|
|
|
[
|
|
|
'page.required' => 'page不能为空',
|
|
|
'page.integer' => 'page必须是整数',
|
|
|
- 'limit.required' => 'limit不能为空',
|
|
|
- 'limit.integer' => 'limit必须是整数',
|
|
|
+ 'page_size.required' => 'page_size不能为空',
|
|
|
+ 'page_size.integer' => 'page_size必须是整数',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
@@ -2287,6 +2289,7 @@ class NewsController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get('UserId');
|
|
|
+ $requireData['type_id'] = Context::get('TypeId');
|
|
|
$result = $this->newsServiceClient->complaintList($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|