diff --git a/src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java b/src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java index 0398d7da..a504c737 100644 --- a/src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java +++ b/src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java @@ -9,9 +9,6 @@ import com.peanut.modules.book.service.MedicinalDrugService; import com.peanut.modules.book.service.MedicinalMaterialsService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.select.Elements; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -47,9 +44,15 @@ public class MedicinalMaterialsController { if (StringUtils.isNotEmpty(params.get("effect").toString())){ wrapper.like(MedicinalMaterials::getEffect,params.get("effect")); } - wrapper.and(t->t.like(MedicinalMaterials::getProperty,params.get("taste")) - .or().like(MedicinalMaterials::getProperty,params.get("property")) - .or().like(MedicinalMaterials::getProperty,params.get("tropism"))); + if (StringUtils.isNotEmpty(params.get("taste").toString())){ + wrapper.like(MedicinalMaterials::getTaste,params.get("taste")); + } + if (StringUtils.isNotEmpty(params.get("property").toString())){ + wrapper.like(MedicinalMaterials::getProperty,params.get("property")); + } + if (StringUtils.isNotEmpty(params.get("tropism").toString())){ + wrapper.like(MedicinalMaterials::getTropism,params.get("tropism")); + } wrapper.orderByAsc(MedicinalMaterials::getSort); wrapper.orderByDesc(MedicinalMaterials::getHits); Page page = materialsService.page(new Page<>(