Commit b185ad49 authored by 张辰's avatar 张辰

fix bug list in

parent 35797e5e
......@@ -2,8 +2,10 @@ package com.tanpu.community.api.beans.resp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
......@@ -14,6 +16,8 @@ import java.math.BigDecimal;
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "客户信息")
public class Customer {
......
......@@ -208,9 +208,11 @@ public class ThemeService {
*/
public List<ThemeEntity> queryNewestByTopic(String topidId, Integer pageNo, Integer pageSize, List<String> excludeIds) {
LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
.eq(ThemeEntity::getTopicId, topidId)
.notIn(ThemeEntity::getThemeId, excludeIds)
.last("limit " + pageNo + ", " + pageSize)
.eq(ThemeEntity::getTopicId, topidId);
if (!excludeIds.isEmpty()) {
queryWrapper.notIn(ThemeEntity::getThemeId, excludeIds);
}
queryWrapper.last("limit " + pageNo + ", " + pageSize)
.orderByDesc(ThemeEntity::getCreateTime)
.eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode());
return themeMapper.selectList(queryWrapper);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment