b2894lxlx/guofu-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
b2894lxlx
2024-10-19 11:23:20 +08:00
parent 50a6a51195 2c9bd92a87
commit 6f27e020a4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gxwebsoft/cms/entity/Navigation.java
View File

@@ -152,6 +152,10 @@ public class Navigation implements Serializable {
@TableField(exist = false)
private String categoryPath;
@ApiModelProperty(value = "栏目下的新闻列表")
@TableField(exist = false)
private List<Article> articleList;
public String getCategoryName() {
return this.title;
}

18
src/main/java/com/gxwebsoft/cms/service/impl/NavigationServiceImpl.java
View File

@@ -6,8 +6,11 @@ import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.cms.entity.Article;
import com.gxwebsoft.cms.entity.Design;
import com.gxwebsoft.cms.mapper.NavigationMapper;
import com.gxwebsoft.cms.param.ArticleParam;
import com.gxwebsoft.cms.service.ArticleService;
import com.gxwebsoft.cms.service.DesignService;
import com.gxwebsoft.cms.service.NavigationService;
import com.gxwebsoft.cms.entity.Navigation;
@@ -37,6 +40,8 @@ public class NavigationServiceImpl extends ServiceImpl<NavigationMapper, Navigat
private DesignService designService;
@Resource
private NavigationMapper navigationMapper;
@Resource
private ArticleService articleService;
@Override
public PageResult<Navigation> pageRel(NavigationParam param) {
@@ -52,6 +57,19 @@ public class NavigationServiceImpl extends ServiceImpl<NavigationMapper, Navigat
// 排序
PageParam<Navigation, NavigationParam> page = new PageParam<>();
page.setDefaultOrder("top asc,sort_number asc,navigation_id asc");
// 是否读取新闻列表
if (param.getSceneType() != null && param.getSceneType().equals("showArticle")) {
list.forEach(d->{
final ArticleParam articleParam = new ArticleParam();
articleParam.setCategoryId(d.getNavigationId());
articleParam.setDeleted(0);
if(param.getLimit() != null){
articleParam.setLimit(param.getLimit());
}
final PageResult<Article> articlePageResult = articleService.pageRel(articleParam);
d.setArticleList(articlePageResult.getList());
});
}
return page.sortRecords(list);
}