From abfad131019fc3c6213344bf4f741d77081c31c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <박재우@DESKTOP-EF7ECBO>
Date: Fri, 23 Sep 2022 11:12:34 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20reposito?=
 =?UTF-8?q?ry=20=EC=84=9C=EC=88=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acnt/cstmr/service/AcntCstmrService.java  | 29 ++++++++++++-------
 .../pty/PtyCstmrGroupRepository.java          |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
index 6729991..acf3a5b 100644
--- a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
+++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
@@ -274,10 +274,6 @@ public class AcntCstmrService {
 	}
 	
 	public boolean userDelete(int cstmrSno) {
-		PtyCstmrBas userEntity = ptyCstmrBasRepository.findByUserGroupId(cstmrSno);
-		userEntity.setCstmrStatusCd("W");
-		userEntity.setCstmrStatusCngDt(DateUtils.nowDate());
-		ptyCstmrBasRepository.save(userEntity);
 		
 		List<JwtGroupModel> groupInfo = jwtTokenUtil.getGroupAuthByToken();
 		for(JwtGroupModel group : groupInfo) {
@@ -287,19 +283,30 @@ public class AcntCstmrService {
 					groupEntity.setUseYn("N");
 					ptyGroupBasRepository.save(groupEntity);
 				}
-			} 
+			PtyCstmrGroup cstmrEntity = ptyCstmrGroupRepository.changeGroupJoinYn(group.getGroupId());
+				if(!(cstmrEntity == null)) {
+					cstmrEntity.setJoinYn("N");
+					ptyCstmrGroupRepository.save(cstmrEntity);
+				}
+			}
+			List<PtyCstmrGroup> AprvlEntity = ptyCstmrGroupRepository.changeGroupAprvlYn(cstmrSno);
+			if(!(AprvlEntity == null)) {
+				for(PtyCstmrGroup Aprvl : AprvlEntity) {
+					Aprvl.setAprvlYn("N");
+					Aprvl.setAprvlDt(null);
+					ptyCstmrGroupRepository.save(Aprvl);
+				}
 			PtyCstmrGroup cstmrEntity = ptyCstmrGroupRepository.findGroupId(group.getGroupId(), cstmrSno);
 			if(!(cstmrEntity == null)) {
 				cstmrEntity.setJoinYn("N");
 				ptyCstmrGroupRepository.save(cstmrEntity);
 			}
 		}
-		List<PtyCstmrGroup> AprvlEntity = ptyCstmrGroupRepository.changeGroupAprvlYn(cstmrSno);
-		for(PtyCstmrGroup Aprvl : AprvlEntity) {
-			Aprvl.setAprvlYn("N");
-			Aprvl.setAprvlDt(null);
-			ptyCstmrGroupRepository.save(Aprvl);
-		}
+	}
+		PtyCstmrBas userEntity = ptyCstmrBasRepository.findByUserGroupId(cstmrSno);
+		userEntity.setCstmrStatusCd("W");
+		userEntity.setCstmrStatusCngDt(DateUtils.nowDate());
+		ptyCstmrBasRepository.save(userEntity);
 			
 		boolean result = true;
 		return result;
diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java
index a16c27b..ab965ad 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java
@@ -20,7 +20,7 @@ public interface PtyCstmrGroupRepository extends JpaRepository<PtyCstmrGroup, In
     
     @Query("select p from PtyCstmrGroup p " +
     		"where p.groupId = :groupId " )
-    List<PtyCstmrGroup> changeGroupJoinYn(@Param("groupId") String groupId);
+    PtyCstmrGroup changeGroupJoinYn(@Param("groupId") String groupId);
     
     @Query("select p from PtyCstmrGroup p " +
     		"where p.cstmrSno = :cstmrSno " )