|
@@ -108,7 +108,6 @@ public class ArticleController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/info/articlerecommendation-{id}-{pageNum}.html")
|
|
|
public String selectedList(@PathVariable("id") Integer id, @PathVariable("pageNum") Integer pageNum, final Model model) {
|
|
|
- PageHelper.startPage(pageNum, 10);
|
|
|
List<BaseLink> typeList = articleService.getArticleTypes();
|
|
|
if (id == 1) {//精选文章
|
|
|
List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(0, 3);
|
|
@@ -131,8 +130,9 @@ public class ArticleController extends BaseController {
|
|
|
* 精选文章和美业资料列表数据
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
- @GetMapping("/info/articlerecommendation/{id}")
|
|
|
- public ResponseJson<PaginationVo> toPagination(@PathVariable("id") Integer id) {
|
|
|
+ @GetMapping("/info/articlerecommendation/{id}/{pageNum}")
|
|
|
+ public ResponseJson<PaginationVo> toPagination(@PathVariable("id") Integer id,@PathVariable("pageNum") Integer pageNum) {
|
|
|
+ PageHelper.startPage(pageNum, 10);
|
|
|
PaginationVo pageData = null;
|
|
|
if (id == 1) {//精选文章
|
|
|
List<Article> infoSelected = articleService.getArticleSelected(null, null);
|