wangqifan 4 년 전
부모
커밋
4da75cd018

+ 1 - 0
src/main/java/com/izouma/tcg/service/card/CardCaseService.java

@@ -85,6 +85,7 @@ public class CardCaseService {
             cardCases = cardCaseRepo.findAllByCaseStatusAndSeriesId(caseStatus, seriesId);
         }
         List<CardCaseDTO> result = new ArrayList<>();
+        cardCases.removeIf(CardCase::isDel);
         cardCases.forEach(cardCase -> {
             CardCaseDTO cardCaseDTO = new CardCaseDTO();
             cardCaseDTO.setCardCaseId(cardCase.getId());

+ 3 - 1
src/main/java/com/izouma/tcg/web/card/CollectionController.java

@@ -64,7 +64,9 @@ public class CollectionController extends BaseController {
     @GetMapping("/findBySeriesId")
     @ApiOperation("获取系列卡牌所有主题")
     public List<Collection> findBySeriesId(Long seriesId) {
-        return collectionRepo.findAllBySeriesId(seriesId);
+        List<Collection> result = collectionRepo.findAllBySeriesId(seriesId);
+        result.removeIf(Collection::isDel);
+        return result;
     }
 }