diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java index 3f538ce..e0a1d4e 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java @@ -1,5 +1,6 @@ package com.lyms.talkonlineweb.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,6 +15,7 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.codec.multipart.Part; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -101,12 +103,20 @@ public class ArticleController { BaseResponse baseResponse = new BaseResponse(); Page page = new Page<>(current, size); Page articlePagePage = new Page<>(); + QueryWrapper query=new QueryWrapper(); + if(StringUtils.isEmpty(article.getTitle())){ + article.setTitle(null); + }else{ + query.like("title",article.getTitle()); + } + if (sort == 1) { - articlePagePage = articleInfoService.page(page, Wrappers.query(article).orderByDesc("updated_time", "createdtime")); + query.orderByDesc("updated_time", "createdtime"); } if (sort == 2) { - articlePagePage = articleInfoService.page(page, Wrappers.query(article).orderByAsc("updated_time", "createdtime")); + query.orderByAsc("updated_time", "createdtime"); } + articlePagePage = articleInfoService.page(page, query); baseResponse.setObject(articlePagePage); return baseResponse;