屏蔽search

src/main/java/com/izouma/nineth/repo/BannerRepo.java

@@ -1,16 +1,20 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.Banner;
+import com.izouma.nineth.enums.BannerType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface BannerRepo extends JpaRepository<Banner, Long>, JpaSpecificationExecutor<Banner> {
     @Query("update Banner t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<Banner> findByLinkContentAndTypeAndDel(String linkContent, BannerType type, boolean del);
 }

src/main/java/com/izouma/nineth/web/CollectionController.java

@@ -1,16 +1,14 @@
 package com.izouma.nineth.web;
 
 import com.fasterxml.jackson.annotation.JsonView;
+import com.izouma.nineth.domain.Banner;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.CollectionPrivilege;
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.dto.*;
+import com.izouma.nineth.enums.BannerType;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.AssetRepo;
-import com.izouma.nineth.repo.CollectionPrivilegeRepo;
-import com.izouma.nineth.repo.CollectionRepo;
-import com.izouma.nineth.repo.NewsRepo;
-import com.izouma.nineth.service.AssetService;
+import com.izouma.nineth.repo.*;
 import com.izouma.nineth.service.CacheService;
 import com.izouma.nineth.service.CollectionService;
 import com.izouma.nineth.service.LikeService;
@@ -26,6 +24,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -44,6 +43,7 @@ public class CollectionController extends BaseController {
     private CacheService            cacheService;
     private CollectionPrivilegeRepo collectionPrivilegeRepo;
     private AssetRepo               assetRepo;
+    private BannerRepo              bannerRepo;
 
     @PreAuthorize("hasAnyRole('ADMIN','SAAS')")
     @PostMapping("/save")
@@ -221,6 +221,10 @@ public class CollectionController extends BaseController {
 
     @GetMapping("/count")
     public Map<String, String> countNum(@RequestParam String search) {
+        List<Banner> list = bannerRepo.findByLinkContentAndTypeAndDel(search, BannerType.MARKET, false);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
         PageQuery pageQuery = new PageQuery();
         pageQuery.setPage(0);
         pageQuery.setSize(1);