Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签调整，优化

Browse Source
This commit is contained in:
yaoyuan2.chu
2020-11-11 23:39:08 +08:00
parent 16a0e65627
commit ae0650fac4
46 changed files with 769 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java
+7 -7
View File
@@ -37,22 +37,22 @@ public class DiscussionsServiceImpl implements IDiscussionsService {
}
@Override
public Page<Discussion> queryAllDiscussionsList(Discussion discussion, int pageNum, int pageSize,String tag,String type) {
public Page<Discussion> queryAllDiscussionsList(Discussion discussion, int pageNum, int pageSize, String tag, String type) {
Sort sort = new Sort(Sort.Direction.DESC, "id");
if(type.equals("hot")){
if (type.equals("hot")) {
sort = new Sort(Sort.Direction.DESC, "likeCount");
}else if(type.equals("new")){
} else if (type.equals("new")) {
sort = new Sort(Sort.Direction.DESC, "startTime");
}
@SuppressWarnings("deprecation")
Pageable pageable = new PageRequest(pageNum, pageSize, sort);
//将匹配对象封装成Example对象
Example<Discussion> example = Example.of(discussion);
if(null!=tag && !"all".equals(tag)){
Page<Discussion> pageList= discussionsRepository.findByQuery(tag, pageable);
if (null != tag && !"all".equals(tag)) {
Page<Discussion> pageList = discussionsRepository.findByQuery(tag, pageable);
return pageList;
}else{
Page<Discussion> pageList= discussionsRepository.findAll(example, pageable);
} else {
Page<Discussion> pageList = discussionsRepository.findAll(example, pageable);
return pageList;
}