diff --git a/WebContent/jsp/onl/apim/portaluser/portalUserMan.jsp b/WebContent/jsp/onl/apim/portaluser/portalUserMan.jsp index 017c49f..35cadcc 100644 --- a/WebContent/jsp/onl/apim/portaluser/portalUserMan.jsp +++ b/WebContent/jsp/onl/apim/portaluser/portalUserMan.jsp @@ -92,7 +92,8 @@ '<%= localeMessage.getString("portalUser.roleName") %>', '<%= localeMessage.getString("portalUser.userStatus") %>', '<%= localeMessage.getString("portalUser.createOn") %>', - '<%= localeMessage.getString("portalUser.approvalStatus") %>' + '<%= localeMessage.getString("portalUser.approvalStatus") %>', + '<%= localeMessage.getString("portalUser.accountLockYn") %>' ], colModel: [ {name: 'rowNum', align: 'center', width: '30', sortable: false}, @@ -104,7 +105,8 @@ {name: 'roleCodeDescription', align: 'center', width: "80"}, {name: 'userStatusDescription', align: 'center', width: "50"}, {name: 'createdDate', align: 'center', width: "100", formatter: timeStampFormat}, - {name: 'approvalStatusDescription', align: 'center', width: "50"} + {name: 'approvalStatusDescription', align: 'center', width: "50"}, + {name: 'accountLockYn', align: 'center', width: "50"} ], jsonReader: { repeatitems: false diff --git a/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp b/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp index b970798..533c8a7 100644 --- a/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp +++ b/WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp @@ -184,6 +184,9 @@ } else { $('#orgInfoSection').hide(); } + + $("select[name=accountLockYn]").val(data.accountLockYn); + // 25.09.23 - 마스킹 해제 상태를 기본으로 적용 / Rinjae updateButtonStates($("#userStatus").val(), true); @@ -633,6 +636,19 @@ + + <%= getRequiredLabel(localeMessage.getString("portalUser.accountLockYn")) %> + +
+ +
+ + + + diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserUI.java index 475ecda..16094a5 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserUI.java @@ -50,4 +50,5 @@ public class PortalUserUI { @DateTimeFormat(pattern = "yyyyMMddHHmmss") private LocalDateTime lastModifiedDate; + private String accountLockYn; } diff --git a/src/main/resources/message/LocaleMessage_ko.properties b/src/main/resources/message/LocaleMessage_ko.properties index 61a0e22..15179a2 100644 --- a/src/main/resources/message/LocaleMessage_ko.properties +++ b/src/main/resources/message/LocaleMessage_ko.properties @@ -2728,6 +2728,7 @@ portalUser.mobile = \uD734\uB300\uD3F0\uBC88\uD638 portalUser.roleName = \uAD8C\uD55C portalUser.emailAddr =\uC774\uBA54\uC77C \uC544\uC774\uB514 portalUser.approvalStatus =\uC2B9\uC778\uC0C1\uD0DC +portalUser.accountLockYn =\uCC28\uB2E8\uC5EC\uBD80 portalUserDetail.title =\uAC00\uC785\uC790\uC815\uBCF4 portalOrgDetail.title=\uBC95\uC778 \uC815\uBCF4