diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java index 7844a0e..e7110a6 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java @@ -194,9 +194,10 @@ public class BasGroupController { /** * 그룹 수정 * @return + * @throws Exception */ @PutMapping(value = "/update") - public ResponseEntity update(@RequestBody BasGroupModel rq) { + public ResponseEntity update(@RequestBody BasGroupModel rq) throws Exception { Map resultMap = new HashMap(); try { @@ -204,11 +205,18 @@ public class BasGroupController { resultMap.put("result", result); - } catch (Exception e) { - log.error("IGNORE : {}", e); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(new ErrorResponse("Server Error", "-1")); - +// } catch (Exception e) { +// log.error("IGNORE : {}", e); +// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) +// .body(new ErrorResponse("Server Error", "-1")); +// +// } + } catch (CustomException e) { + log.error("IGNORE : {}", e); + resultMap.put("result", false); + resultMap.put("errorCode", e.getErrorCode()); + resultMap.put("errorMessage", e.getMessage()); + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); } return ResponseEntity.ok().body(new SuccessResponse(resultMap)); diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java index dfaa7ba..bd826ed 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -175,6 +175,12 @@ public class BasGroupService { public boolean update(BasGroupModel rq) throws Exception{ Optional optional = ptyGroupBasRepository.findById(rq.getGroupId()); + List groupNm = ptyGroupBasRepository.findByGroupNm(rq.getGroupNm()); + for(PtyGroupBas name : groupNm) { + if(rq.getGroupNm().equals(name.getGroupNm())) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + } if (!optional.isPresent()) { throw new CustomException(ErrorCode.DATA_NOTFIND);