Merge pull request #255 from cheng521521/main

fix: share function not condition search
Dapp-Learning-DAO · May 30, 2024 · 06d7ea0 · 06d7ea0
2 parents 8c4f8a4 + 71305b7
commit 06d7ea0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/dl/officialsite/sharing/SharingController.java b/src/main/java/com/dl/officialsite/sharing/SharingController.java
@@ -91,7 +91,7 @@ public BaseResponse loadSharing(@RequestParam(value = "pageNo",defaultValue = "1
     /**
      * 条件搜索
      */
-    @PostMapping("search")
+    @PostMapping("/search")
     public BaseResponse searchSharing(@RequestBody ShareSearchVo searchVo, @RequestParam(value =
         "pageNo",defaultValue = "1") int pageNumber,
                                       @RequestParam(value = "pageSize",defaultValue = "20") int pageSize){

diff --git a/src/main/java/com/dl/officialsite/sharing/SharingService.java b/src/main/java/com/dl/officialsite/sharing/SharingService.java
@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import org.springframework.util.StringUtils;
 
 @Service
 @Slf4j
@@ -216,7 +217,7 @@ public Page<Share> searchSharing(ShareSearchVo searchVo, Pageable pageable) {
         Page<Share> page = sharingRepository.findAll(
             (Specification<Share>) (root, query, criteriaBuilder) -> {
                 List<Predicate> predicates = new LinkedList<>();
-                if (searchVo.getTheme() != null) {
+                if (StringUtils.hasText(searchVo.getTheme())) {
                     predicates.add(
                         criteriaBuilder.like(root.get("theme"), "%" + searchVo.getTheme() + "%"));
                 }
@@ -237,7 +238,7 @@ public Page<Share> searchSharing(ShareSearchVo searchVo, Pageable pageable) {
                     predicates.add(criteriaBuilder.greaterThan(root.get("date"), searchVo.getDate()));
                 }
                 query.orderBy(criteriaBuilder.desc(root.get("createTime")));
-                return null;
+                return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
             }, pageable);
         return page;
     }