From 702a9a899b0c2809189bd3ef7328b347bd6992de Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 23 Jun 2026 19:27:37 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=95=BD=EA=B4=80=20=EC=9C=A0=ED=98=95?= =?UTF-8?q?=EC=97=90=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=EC=88=98?= =?UTF-8?q?=EC=A7=91=EB=8F=99=EC=9D=98=EC=84=9C(PRIVACY=5FCOLLECT)=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=ED=99=94=EB=A9=B4=20=EC=95=BD=EA=B4=80=20=EC=9C=A0?= =?UTF-8?q?=ED=98=95=20=ED=91=9C=EC=8B=9C=20=EC=8B=9C=20'(=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=95=88=ED=95=A8)'=20=EB=9D=BC=EB=B2=A8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=B2=98=EB=A6=AC=20-=20=EC=95=BD=EA=B4=80=20?= =?UTF-8?q?=EC=9C=A0=ED=98=95=20=EB=9D=BC=EB=B2=A8=20=EB=B3=80=ED=99=98=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20PortalTermsManService=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=20=EB=B0=8F=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portalterms/PortalTermsManController.java | 2 +- .../portalterms/PortalTermsManService.java | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManController.java index 2582606..418bde8 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManController.java @@ -60,7 +60,7 @@ public class PortalTermsManController extends BaseAnnotationController { .map(type -> { ComboVo vo = new ComboVo(); vo.setCode(type.name()); - vo.setCodename(type.getDescription()); + vo.setCodename(PortalTermsManService.displayLabel(type)); return vo; }).collect(Collectors.toList()); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManService.java index 1befa18..c9d6696 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalterms/PortalTermsManService.java @@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.EnumSet; import java.util.HashSet; import java.util.Set; @@ -49,6 +50,26 @@ public class PortalTermsManService extends BaseService { this.fileService = fileService; } + /** 관리 화면에서 '(사용안함)'으로 표시할(=신규 등록에 더 이상 쓰지 않는) 약관 유형 */ + private static final Set DEPRECATED_AGREEMENT_TYPES = EnumSet.of( + AgreementType.PRIVACY_POLICY, + AgreementType.PRIVACY_COLLECT_IND, + AgreementType.PRIVACY_COLLECT_ORG); + + /** + * 관리 화면(콤보/목록)에 표시할 약관 유형 라벨. + * 개인정보처리방침 및 개인용/법인용 개인정보수집동의서는 신규 통합 유형 {@link AgreementType#PRIVACY_COLLECT} 등으로 + * 대체될 예정이므로 '(사용안함)'을 덧붙여 안내한다. + * enum 자체의 description은 포털 사용자 화면(AgreementsController#agreementTitle)에서도 쓰이므로 변경하지 않는다. + */ + public static String displayLabel(AgreementType type) { + String label = type.getDescription(); + if (DEPRECATED_AGREEMENT_TYPES.contains(type)) { + label += "(사용안함)"; + } + return label; + } + private String findName(String userId) { if (StringUtils.isBlank(userId)) { return ""; @@ -66,7 +87,7 @@ public class PortalTermsManService extends BaseService { PortalTermsUI portalTermsUI = portalTermsUIMapper.toVo(agreements); portalTermsUI.setCreatedByName(findName(agreements.getCreatedBy())); portalTermsUI.setLastModifiedByName(findName(agreements.getLastModifiedBy())); - portalTermsUI.setName(agreements.getAgreementsType().getDescription()); + portalTermsUI.setName(displayLabel(agreements.getAgreementsType())); return portalTermsUI; }); }