From b6ddc1c8b4c4af79714d2728e60b9c37b087c248 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Dec 2025 13:27:45 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EA=B4=80,=20=EC=95=B1=20=EC=8A=B9?= =?UTF-8?q?=EC=9D=B8=EC=8B=9C=20=ED=8C=9D=EC=97=85=20=EB=8B=AB=EA=B8=B0=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/portalAppApprovalManPopup.jsp | 18 +++++++++++++++--- .../approval/portalUserApprovalManPopup.jsp | 18 +++++++++++++++--- .../onl/apim/apigroup/ApiGroupService.java | 16 +++++++++++++--- .../approval/PortalApprovalManService.java | 4 ++-- 4 files changed, 45 insertions(+), 11 deletions(-) diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp index dd62cc2..ad28250 100644 --- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp @@ -54,7 +54,11 @@ success: function (args) { <%--alert("<%= localeMessage.getString("approval.approveSuccess") %>");--%> alert("승인되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function (e) { @@ -73,7 +77,11 @@ data: {cmd: "REJECT", id: key, rejectReason: rejectReason}, success: function (args) { alert("반려되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function (e) { @@ -91,7 +99,11 @@ data: {cmd: "REDEPLOY", id: key}, success: function (args) { alert("요청되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function (e) { diff --git a/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp index 6ee758c..24427b3 100644 --- a/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp @@ -113,7 +113,11 @@ data: {cmd: "APPROVE", id: key}, success: function(args) { alert("승인되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function(e) { @@ -132,7 +136,11 @@ data: {cmd: "REJECT", id: key, rejectReason: rejectReason}, success: function(args) { alert("반려되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function(e) { @@ -150,7 +158,11 @@ data: {cmd: "REDEPLOY", id: key}, success: function(args) { alert("요청되었습니다."); - window.opener.location.reload(); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } window.close(); }, error: function(e) { diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/apigroup/ApiGroupService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/apigroup/ApiGroupService.java index 7ad1282..85bf102 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/apigroup/ApiGroupService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/apigroup/ApiGroupService.java @@ -8,6 +8,7 @@ import com.eactive.eai.data.jpa.AbstractDataService; import com.eactive.eai.rms.onl.apim.apigroup.ui.ApiGroupUISearch; import com.querydsl.core.types.dsl.BooleanExpression; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -58,11 +59,20 @@ public class ApiGroupService extends AbstractDataService apiGroupIds = getJPAQueryFactory() + .select(qApiGroupApi.id.apiGroupId) + .from(qApiGroupApi) .where(qApiGroupApi.id.apiId.eq(apiId)) - .distinct() .fetch(); + if (apiGroupIds.isEmpty()) { + return new ArrayList<>(); + } + + return getJPAQueryFactory().selectFrom(qApiGroup) + .where(qApiGroup.id.in(apiGroupIds)) + .fetch(); } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index 19c4fe8..ddaf85b 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -61,14 +61,14 @@ public class PortalApprovalManService extends BaseService { public Page selectList(Pageable pageable, PortalApprovalUISearch portalApprovalUISearch) { Page approval = approvalService.findAll(pageable, portalApprovalUISearch); - return approval.map(entity -> getDetailWithMaskOption(entity.getId(), true)); + return approval.map(entity -> getDetailWithMaskOption(entity.getId(), false)); } /** * 마스킹된 상세 정보 조회 */ public PortalApprovalUI selectDetail(String id) { - return getDetailWithMaskOption(id, true); + return getDetailWithMaskOption(id, false); } /**