|
@@ -1,6 +1,7 @@
|
|
|
package com.fjhx.xmhjc.service.topic.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.fjhx.xmhjc.entity.column.dto.ColumnArticleDto;
|
|
|
import com.fjhx.xmhjc.entity.topic.po.TopicContent;
|
|
|
import com.fjhx.xmhjc.entity.website.po.WebsiteUsers;
|
|
@@ -94,9 +95,8 @@ public class TopicContentServiceImpl extends ServiceImpl<TopicContentMapper, Top
|
|
|
}else if("3".equals(sortType)) {
|
|
|
wrapper.eq("tc", TopicContent::getAuthor, WebsiteUserUtil.getLoginWebsiteUser().getId());
|
|
|
}
|
|
|
-
|
|
|
wrapper.orderByDesc("tc", TopicContent::getId);
|
|
|
-
|
|
|
+ wrapper.eq(StrUtil.isNotBlank(dto.getType()), "tc.type", dto.getType());
|
|
|
Page<TopicContentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
return page;
|
|
|
}
|