diff --git a/src/main/java/com/tiki/server/common/config/SwaggerConfig.java b/src/main/java/com/tiki/server/common/config/SwaggerConfig.java index 37bccac4..f513bbb6 100644 --- a/src/main/java/com/tiki/server/common/config/SwaggerConfig.java +++ b/src/main/java/com/tiki/server/common/config/SwaggerConfig.java @@ -42,7 +42,7 @@ public OpenAPI openApi() { return new OpenAPI() .components(components) .security(List.of(securityRequirement)) - .servers(List.of(server)) + // .servers(List.of(server)) .info(info); } } diff --git a/src/main/java/com/tiki/server/timeblock/repository/TimeBlockRepository.java b/src/main/java/com/tiki/server/timeblock/repository/TimeBlockRepository.java index 3abaf006..d640f983 100644 --- a/src/main/java/com/tiki/server/timeblock/repository/TimeBlockRepository.java +++ b/src/main/java/com/tiki/server/timeblock/repository/TimeBlockRepository.java @@ -11,7 +11,7 @@ public interface TimeBlockRepository extends JpaRepository { @Query(value = "select * from time_block " + "where team_id = :teamId and accessible_position = :position and " - + "(to_char(start_date, 'YYYY-MM') <= :date or to_char(end_date, 'YYYY-MM') >= :date) " + + "(to_char(start_date, 'YYYY-MM') <= :date and to_char(end_date, 'YYYY-MM') >= :date) " + "order by start_date asc", nativeQuery = true) List findByTeamAndAccessiblePositionAndDate(long teamId, String position, String date); }