diff --git a/service-paper/src/main/java/com/jty/wsxt/application/service/impl/PaperServiceImpl.java b/service-paper/src/main/java/com/jty/wsxt/application/service/impl/PaperServiceImpl.java index 5921a82..08c8782 100644 --- a/service-paper/src/main/java/com/jty/wsxt/application/service/impl/PaperServiceImpl.java +++ b/service-paper/src/main/java/com/jty/wsxt/application/service/impl/PaperServiceImpl.java @@ -79,6 +79,10 @@ class PaperDsl { List<Predicate> predicate = new ArrayList<>(); predicate.add(cb.equal(root.get("creatorId"), searchDto.getCreatorId())); + if(searchDto.getSubjectId() != null){ + predicate.add(cb.equal(root.get("subjectId"), searchDto.getSubjectId())); + } + if(searchDto.getUploadingStartTime() != null) { predicate.add(cb.greaterThanOrEqualTo(root.get("createTime"), searchDto.getUploadingStartTime())); } diff --git a/service-paper/src/main/java/com/jty/wsxt/interfaces/dto/PaperSearchForCreatorDto.java b/service-paper/src/main/java/com/jty/wsxt/interfaces/dto/PaperSearchForCreatorDto.java index 6549e44..4d77196 100644 --- a/service-paper/src/main/java/com/jty/wsxt/interfaces/dto/PaperSearchForCreatorDto.java +++ b/service-paper/src/main/java/com/jty/wsxt/interfaces/dto/PaperSearchForCreatorDto.java @@ -13,6 +13,7 @@ import java.time.LocalDateTime; @Data public class PaperSearchForCreatorDto extends SuperDto { private Integer creatorId; + private Integer subjectId; private LocalDateTime uploadingStartTime; private LocalDateTime uploadingEndTime; }