From 23cfb13b65b136a8ab01d07167e37dc06e5549c0 Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Sat, 17 Jan 2026 21:18:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=A0=95=EB=B3=B4=20->=20?=
 =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=9E=90=ED=8F=AC=ED=83=88=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81=20=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/credential/CredentialService.java   | 14 ++++++++++++++
 .../authserver/client/ClientManService.java      | 16 +++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialService.java
index 0f8a42f..27ab9b5 100644
--- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/credential/CredentialService.java
@@ -29,4 +29,18 @@ public class CredentialService extends AbstractDataService<Credential, String, C
 
         return repository.findAll(predicate, pageable);
     }
+
+    /**
+     * clientId와 orgId로 Credential 조회
+     *
+     * @param clientId 클라이언트 ID
+     * @param orgId 조직 ID
+     * @return Credential 또는 null
+     */
+    public Credential findByClientidAndOrgid(String clientId, String orgId) {
+        QCredential qCredential = QCredential.credential;
+        BooleanExpression predicate = qCredential.clientid.eq(clientId)
+                .and(qCredential.orgid.eq(orgId));
+        return repository.findOne(predicate).orElse(null);
+    }
 }
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/authserver/client/ClientManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/authserver/client/ClientManService.java
index 8e2f2bc..4557ab9 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/authserver/client/ClientManService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/authserver/client/ClientManService.java
@@ -26,10 +26,10 @@ import com.eactive.eai.rms.common.base.OnlBaseService;
 import com.eactive.eai.rms.data.entity.onl.authserver.ClientEntityService;
 import com.eactive.eai.rms.data.entity.onl.authserver.ClientSearch;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -167,19 +167,15 @@ public class ClientManService extends OnlBaseService {
 			DataSourceContextHolder.setDataSourceType(monitoringType);
 
 			// 5. 기존 Credential 확인
-			Optional<Credential> existingCredential = credentialService.getRepository()
-					.findOne((root, query, cb) -> cb.and(
-							cb.equal(root.get("clientid"), clientId),
-							cb.equal(root.get("orgid"), orgId)
-					));
+			Credential existingCredential = credentialService.findByClientidAndOrgid(clientId, orgId);
 
 			// 6. 데이터 변환 (ClientEntity → CredentialUI)
 			CredentialUI credentialUI = convertToCredentialUI(clientEntity);
 
 			SyncResult.SyncAction action;
-			if (existingCredential.isPresent()) {
+			if (existingCredential != null) {
 				// 업데이트: 기존 값 유지해야 할 필드 처리
-				Credential existing = existingCredential.get();
+				Credential existing = existingCredential;
 				if (StringUtils.isNotBlank(existing.getAppDescription())) {
 					credentialUI.setAppDescription(existing.getAppDescription());
 				}
@@ -258,7 +254,9 @@ public class ClientManService extends OnlBaseService {
 
 		// 수정 정보
 		credentialUI.setModifiedby(clientEntity.getModifiedby());
-		credentialUI.setModifiedon(clientEntity.getModifiedon());
+		if (clientEntity.getModifiedon() != null) {
+			credentialUI.setModifiedon(clientEntity.getModifiedon().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+		}
 
 		// API 목록 변환
 		List<ApiSpecInfoUI> apiList = new ArrayList<>();