Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/workspaces/eapim-bundle/bundles/251111/eapim-admin_incremental_2025-08-01.bundle into jenkins_with_weblogic

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

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 @@
                         </div>
                     </td>
                 </tr>
+                <tr>
+                    <th><%= getRequiredLabel(localeMessage.getString("portalUser.accountLockYn")) %></th>
+                    <td>
+                        <div class="select-style">
+                            <select name="accountLockYn"  id="accountLockYn">
+                            	<option value="Y">Y</option>
+                            	<option value="N">N</option>
+                            </select>
+                        </div>
+                    </td>
+                    <th></th>
+                    <td></td>
+                </tr>
             </table>
         </form>