From d3fdd9c747c6a75a4a7ec7ed693661b428cecb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Mon, 26 Sep 2022 10:33:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EA=B4=80=EB=A6=AC=20-=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80=EB=A6=AC=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20=EC=8A=B9=EC=9D=B8=EB=90=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=EB=A7=8C=20=ED=91=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bas/group/controller/BasGroupUserController.java | 6 +++++- .../biz/api/bas/group/service/BasGroupUserService.java | 1 + .../biz/jpa/repository/pty/PtyGroupQueryRepository.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java index 73752ea..488f658 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java @@ -30,6 +30,7 @@ import com.palnet.biz.api.comn.response.BasicResponse; import com.palnet.biz.api.comn.response.ErrorResponse; import com.palnet.biz.api.comn.response.SuccessResponse; import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.exception.CustomException; import com.palnet.comn.utils.JsonUtils; import lombok.RequiredArgsConstructor; @@ -95,11 +96,14 @@ public class BasGroupUserController { try { boolean result = service.delegate(rq); resultMap.put("result", result); + } catch (CustomException e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse(e.getMessage(), e.getErrorCode())); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(new ErrorResponse("Server Error", "-1")); - } + } return ResponseEntity.ok().body(new SuccessResponse(resultMap)); } diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java index 652511b..53ad634 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 7b48cd9..4296a36 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -309,6 +309,7 @@ public class PtyGroupQueryRepository{ builder.and(bas.useYn.eq("Y")); builder.and(dtl.joinYn.eq("Y")); + builder.and(dtl.aprvlYn.eq("Y")); if(!StringUtils.isEmpty(rq.getGroupNm())) {