기관, 앱 승인시 팝업 닫기 오류 수정

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) {

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) {

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<ApiGroup, String, ApiGr
 		QApiGroup qApiGroup = QApiGroup.apiGroup;
 		QApiGroupApi qApiGroupApi = QApiGroupApi.apiGroupApi;
 
-		return getJPAQueryFactory().selectFrom(qApiGroup)
+		// Oracle에서 CLOB 필드(contentDetail 등)가 있으면 DISTINCT를 사용할 수 없으므로
-				.leftJoin(qApiGroup.apiGroupApiList, qApiGroupApi)
+		// api_group_api 테이블에서 api_group_id만 조회한 후 엔티티를 조회
+		List<String> 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();
 	}
 }

src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java

@@ -61,14 +61,14 @@ public class PortalApprovalManService extends BaseService {
 
     public Page<PortalApprovalUI> selectList(Pageable pageable, PortalApprovalUISearch portalApprovalUISearch) {
         Page<Approval> 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);
     }
 
     /**