|
@@ -161,42 +161,25 @@ class WebController extends AbstractController
|
|
|
$requireData,
|
|
|
[
|
|
|
'level' => 'required',
|
|
|
- 'pageSize' => 'required',
|
|
|
+ 'imgnum' => 'required',
|
|
|
+ 'textnum' =>'required',
|
|
|
],
|
|
|
[
|
|
|
'level.required' => '新闻类型不能为空',
|
|
|
- 'pageSize.required' => '显示条数不能为空',
|
|
|
-
|
|
|
+ 'imgnum.required' => '图片新闻条数不能为空',
|
|
|
+ 'textnum.required' => '文字新闻条数不能为空'
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()){
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
|
- }
|
|
|
- if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
|
|
|
- $data =[
|
|
|
- 'website_id'=>Context::get("SiteId"),
|
|
|
- 'level'=>$requireData['level'],
|
|
|
- 'pageSize'=>$requireData['pageSize'],
|
|
|
- 'placeid' => $requireData['placeid'],
|
|
|
- 'id' => $requireData['id'],
|
|
|
- ];
|
|
|
-
|
|
|
- }else{
|
|
|
- $data = [
|
|
|
- 'website_id'=>Context::get("SiteId"),
|
|
|
- 'level'=>$requireData['level'],
|
|
|
- 'pageSize'=>$requireData['pageSize'],
|
|
|
- 'id' => $requireData['id'],
|
|
|
- ];
|
|
|
- }
|
|
|
- $result = $this->newsServiceClient->getWebsiteArticlett($data);
|
|
|
- // var_dump($result);
|
|
|
+ }
|
|
|
+ $requireData['website_id'] = Context::get("SiteId");
|
|
|
+ $result = $this->newsServiceClient->getWebsiteArticlett($requireData);
|
|
|
if ($result['code'] != ErrorCode::SUCCESS) {
|
|
|
return Result::error($result['message'],0,[]);
|
|
|
}
|
|
|
return Result::success($result['data']);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|