From 619916a23b1ae9a868ca84014106b92f75c8d4da Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Sun, 30 Oct 2022 20:54:04 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8C=8C=EC=9D=BC=EA=B2=BD=EB=A1=9C=20f?=
 =?UTF-8?q?ix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmm/web/XitFrameAnonymousController.java  |  14 +-
 .../mng/user/model/XitUserReg_inputEvr.jsp    |   6 +-
 .../biz/mng/user/web/UserMgtController.java   |   2 +-
 .../framework/mng/usr/XitUserRegMngVO.xml     | 141 ------------------
 .../framework/biz/mng/usr/mngUserMgtPopup.jsp |   8 +-
 5 files changed, 15 insertions(+), 156 deletions(-)
 delete mode 100644 src/main/resources/validator/framework/mng/usr/XitUserRegMngVO.xml

diff --git a/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java
index c379fc4c..09cc960d 100644
--- a/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java
+++ b/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java
@@ -96,7 +96,7 @@ public class XitFrameAnonymousController {
 			modelMap.addAttribute("checkId", checkId);
 		}
 		
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/XitIdDuplCnfirm"+TILES_TYPE.POPUP.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitIdDuplCnfirm"+TILES_TYPE.POPUP.getVal();
 	}
 	
 	
@@ -172,7 +172,7 @@ public class XitFrameAnonymousController {
 		}
 		
 	
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/XitUserReg_"+cmd+TILES_TYPE.POPUP.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitUserReg_"+cmd+TILES_TYPE.POPUP.getVal();
 	}
 	@RequestMapping(value = "login/UserReg_Forms_{cmd}", method={RequestMethod.GET, RequestMethod.POST})
 	public String UserReg_Forms_page(@PathVariable String cmd
@@ -231,7 +231,7 @@ public class XitFrameAnonymousController {
 		}
 		
 		
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/forms/"+page+TILES_TYPE.POPUP.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/forms/"+page+TILES_TYPE.POPUP.getVal();
 	}
 	
 	
@@ -479,8 +479,8 @@ public class XitFrameAnonymousController {
 		 *   -.작업내용: popup api -> 검색 api 호출 방식으로 변경 
 		 ====================== */
 		//2021.06.22. 주석처리
-//		return XitConst.JSP_BASE_PATH+"common/anonymous/api/XitAdresSearch"+XitConst.TILES_TYPE.POPUP.getVal();
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/api/XitAdresSearchApi"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
+//		return XitConst.JSP_BASE_PATH+"cmm/anonymous/api/XitAdresSearch"+XitConst.TILES_TYPE.POPUP.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/api/XitAdresSearchApi"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
 	}
 	
 	
@@ -491,12 +491,12 @@ public class XitFrameAnonymousController {
 	 ========================== */
 	@GetMapping(value = "step1")
 	public String step1(HttpServletRequest req) {
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/step1"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step1"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
 	}
 	@GetMapping(value = "step2")
 	public String step2() {
 		
-		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"common/anonymous/step2"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
+		return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step2"+ FrameworkConstants.TILES_TYPE.NONE.getVal();
 	}
 	@GetMapping(value = "login")
 	public String login(HttpServletRequest req) {
diff --git a/src/main/java/kr/xit/framework/biz/mng/user/model/XitUserReg_inputEvr.jsp b/src/main/java/kr/xit/framework/biz/mng/user/model/XitUserReg_inputEvr.jsp
index 1dbefbb5..84a7144d 100644
--- a/src/main/java/kr/xit/framework/biz/mng/user/model/XitUserReg_inputEvr.jsp
+++ b/src/main/java/kr/xit/framework/biz/mng/user/model/XitUserReg_inputEvr.jsp
@@ -301,17 +301,17 @@ table {
 		
 		
 		<div id="tabs-0">
-			<%@ include file="/WEB-INF/jsp/framework/biz/common/anonymous/forms/GnrUserForm.jsp" %>
+			<%@ include file="/WEB-INF/jsp/framework/biz/cmm/anonymous/forms/GnrUserForm.jsp" %>
 		</div>
 		<!-- //tabs-0 -->
 		
 		<div id="tabs-1">
-			<%@ include file="/WEB-INF/jsp/framework/biz/common/anonymous/forms/EntUserForm.jsp" %>
+			<%@ include file="/WEB-INF/jsp/framework/biz/cmm/anonymous/forms/EntUserForm.jsp" %>
 		</div>
 		<!-- //tabs-1 -->
 		
 		<div id="tabs-2">
-			<%@ include file="/WEB-INF/jsp/framework/biz/common/anonymous/forms/UserForm.jsp" %>
+			<%@ include file="/WEB-INF/jsp/framework/biz/cmm/anonymous/forms/UserForm.jsp" %>
 		</div>
 		<!-- //tabs-2 -->
 		
diff --git a/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java
index e88971fc..4a9beb9b 100644
--- a/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java
+++ b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java
@@ -75,7 +75,7 @@ public class UserMgtController {
 
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/usr/mngUserMgtPopup.popup");
 		if (Checks.isEmpty(uniqId)) 	mav.addObject("userManageVO", new XitUserRegMngVO());
-		else 							mav.addObject("progrmMngVO", service.findUser(uniqId));
+		else 							mav.addObject("userManageVO", service.findUser(uniqId));
 
 		return mav;
 	}
diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMngVO.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMngVO.xml
deleted file mode 100644
index 5ba4f696..00000000
--- a/src/main/resources/validator/framework/mng/usr/XitUserRegMngVO.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE form-validation PUBLIC 
-    "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" 
-    "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
-
-<form-validation>
-
-    <formset>
-
-        <form name="xitUserRegMngVO">
-        
-            <field property="emplyrId" depends="required, maxlength">
-                <arg0 key="사용자아이디" resource="false"/>
-                <arg1 key="20" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>20</var-value>
-                </var>
-            </field>
-            
-            <field property="emplyrNm" depends="required, maxlength">
-                <arg0 key="사용자이름" resource="false"/>
-                <arg1 key="50" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>50</var-value>
-                </var>
-            </field>
-            
-            <!-- <field property="password" depends="required, password1, password2, password3, password4">
-                <arg0 key="비밀번호" resource="false"/>
-            </field> -->
-            
-            <field property="passwordHint" depends="required">
-                <arg0 key="비밀번호힌트" resource="false"/>
-            </field>
-            
-            <field property="passwordCnsr" depends="required, maxlength">
-                <arg0 key="비밀번호정답" resource="false"/>
-                <arg1 key="100" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>100</var-value>
-                </var>
-            </field>
-            <field
-                property="areaNo" depends="maxlength, mask">
-                <arg0 key="집지역번호" resource="false"/>
-                <arg1 key="4" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>4</var-value>
-                </var>
-                <var>
-                    <var-name>mask</var-name>
-                    <var-value>[0-9]([0-9])*</var-value>
-                </var>
-            </field>
-            <field
-                property="homemiddleTelno" depends="maxlength, mask">
-                <arg0 key="집중간전화번호" resource="false"/>
-                <arg1 key="4" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>4</var-value>
-                </var>
-                <var>
-                    <var-name>mask</var-name>
-                    <var-value>[0-9][0-9][0-9]([0-9])*</var-value>
-                </var>
-            </field>
-            <field
-			    property="homeendTelno" depends="maxlength, mask">
-			    <arg0 key="집마지막전화번호" resource="false"/>
-			    <arg1 key="4" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>4</var-value>
-                </var>
-                <var>
-			        <var-name>mask</var-name>
-			        <var-value>[0-9][0-9][0-9][0-9]</var-value>
-			    </var>
-			</field>
-            <field property="offmTelno" depends="maxlength">
-                <arg0 key="사무실전화번호" resource="false"/>
-                <arg1 key="15" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>15</var-value>
-                </var>
-            </field>
-            
-            <field property="fxnum" depends="maxlength">
-                <arg0 key="팩스번호" resource="false"/>
-                <arg1 key="15" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>15</var-value>
-                </var>
-            </field>
-            
-            <field property="moblphonNo" depends="maxlength">
-                <arg0 key="핸드폰번호" resource="false"/>
-                <arg1 key="15" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>15</var-value>
-                </var>
-            </field>
-            
-            <field property="emailAdres" depends="email">
-                <arg0 key="이메일주소" resource="false"/>
-            </field>
-            
-            <field property="homeadres" depends="maxlength">
-                <arg0 key="주소" resource="false"/>
-                <arg1 key="100" resource="false"/>
-                <var>
-                <var-name>maxlength</var-name>
-                <var-value>100</var-value>
-                </var>
-            </field>
-            
-            <field property="orgnztId" depends="required">
-                <arg0 key="조직코드" resource="false"/>
-            </field>
-            
-<!--             <field property="emplyrSttusCode" depends="required"> -->
-<!--                 <arg0 key="사용자상태코드" resource="false"/> -->
-<!--             </field> -->
-            
-            <field property="groupId" depends="required">
-                <arg0 key="그룹아이디" resource="false"/>
-            </field>
-            
-        </form>
-        
-    </formset>
-
-</form-validation>
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp
index aaf6f43f..f20dd4b0 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp
@@ -105,8 +105,8 @@
 							<label>직위명</label>
 						</th>
 						<td>
-							<form:input path="ofcpsNm" id="ofcpsNm" title="직위명" cssClass="txaIpt" size="20" maxlength="30" />
-							<form:errors path="ofcpsNm" cssClass="error" />
+							<input path="ofcpsNm" id="ofcpsNm" title="직위명" cssClass="txaIpt" size="20" maxlength="30" />
+<%--							<form:errors path="ofcpsNm" cssClass="error" />--%>
 						</td>
 					</tr>
 					<tr>
@@ -165,8 +165,8 @@
 							<label>상세주소</label>
 						</th>
 						<td>
-							<form:input path="detailAdres" id="detailAdres" title="상세주소" cssClass="txaIpt" size="40" maxlength="50" />
-							<form:errors path="detailAdres" cssClass="error" />
+							<input path="detailAdres" id="detailAdres" title="상세주소" cssClass="txaIpt" size="40" maxlength="50" />
+<%--							<form:errors path="detailAdres" cssClass="error" />--%>
 						</td>
 					</tr>