From 05bae8f92a8d53c68c065af8f8aed9742165b777 Mon Sep 17 00:00:00 2001 From: yang Date: Sat, 25 May 2024 03:12:42 +0900 Subject: [PATCH] =?UTF-8?q?RAC-387=20feat=20:=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../senior/domain/repository/SeniorDslRepositoryImpl.java | 3 +++ .../domain/senior/presentation/SeniorController.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java index e484d5b7..45d012cb 100644 --- a/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java +++ b/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java @@ -108,6 +108,9 @@ public Page findAllByFieldSenior(String field, String postgradu, Pageabl } private BooleanExpression fieldSpecifier(String fields) { + if (fields.contains(ALL)) + return TRUE; + String[] field = fields.split(","); if (fields.contains(ETC)) return Arrays.stream(field) diff --git a/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java b/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java index 4b7500df..17479a0a 100644 --- a/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java +++ b/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java @@ -128,7 +128,7 @@ public ResponseDto getSearchSenior(@RequestParam String } @GetMapping("/field") - @Operation(summary = "대학원생 필드 검색", description = "분야 (분야1,분야2 이런식으로, 다른분야 : others), 대학원 필수 (대학원1,대학원2 이런식으로, 다른학교 : others, 전체 : all), 페이지 선택 ") + @Operation(summary = "대학원생 필드 검색", description = "분야 (분야1,분야2 이런식으로, 다른분야 : others, 전체 : all), 대학원 필수 (대학원1,대학원2 이런식으로, 다른학교 : others, 전체 : all), 페이지 선택 ") public ResponseDto getFieldSenior(@RequestParam String field, @RequestParam String postgradu, @RequestParam(required = false) Integer page) {