From 0f1107d75cec64089df0b5bc6516cb43817c9ce1 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 15:00:57 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=9C=A0=EC=A0=80=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 10 +++---- .../framework/biz/mng/user/XitUserInfoVO.java | 2 +- .../biz/mng/user/XitUserRegMngVO.java | 2 +- .../cmm/XitFrameCrud-mysql-mapper.xml | 30 +++++++++---------- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 2 +- .../framework/mng/usr/user-mysql-mapper.xml | 12 ++++---- .../framework/mng/usr/XitUserRegMng.xml | 2 +- .../biz/cmm/anonymous/XitUserReg_input.jsp | 8 ++--- .../biz/cmm/anonymous/forms/UserForm.jsp | 10 +++---- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 6 ++-- .../mng/usr/backup/XitUserRegMng_input.jsp | 8 ++--- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 8 ++--- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 4 +-- .../js/fims/framework/cmm/cmmPopup.js | 4 +-- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java index f876e054..2ba64638 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java @@ -26,7 +26,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String sexdstn_code; //성별 코드 protected String brthdy; //생일 protected String fxnum; //팩스번호 - protected String house_adres; //주택 주소 + protected String addr; //주택 주소 protected String area_no; //지역 번호 protected String detail_adres; //상세 주소 @@ -87,11 +87,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setFxnum(String fxnum) { this.fxnum = fxnum; } - public String getHouse_adres() { - return house_adres; + public String getAddr() { + return addr; } - public void setHouse_adres(String house_adres) { - this.house_adres = house_adres; + public void setAddr(String addr) { + this.addr = addr; } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index 70717223..ab60c5e1 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -33,7 +33,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String sexdstnCode; //성별 코드 protected String brthdy; //생일 protected String fxnum; //팩스번호 - protected String houseAdres; //주택 주소 + protected String addr; //주택 주소 protected String passwordHint; //비밀번호 힌트 protected String passwordCnsr; //비밀번호 정답 protected String areaNo; //지역 번호 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java index 1a9cc338..58f5e8e7 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java @@ -83,7 +83,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 집 주소 */ - private String houseAdres; + private String addr; /** * 소속기관코드 */ diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index e69448dd..fe9ff21d 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -2073,7 +2073,7 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES + ,ADDR ,AREA_NO ,DETAIL_ADRES ,ZIP @@ -2093,7 +2093,7 @@ AND SEXDSTN_CODE = #{sexdstn_code } AND BRTHDY = #{brthdy } AND FXNUM = #{fxnum } - AND HOUSE_ADRES = #{house_adres } + AND ADDR = #{addr } AND AREA_NO = #{area_no } AND DETAIL_ADRES = #{detail_adres } AND ZIP = #{zip } @@ -2115,7 +2115,7 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES + ,ADDR ,AREA_NO ,DETAIL_ADRES ,ZIP @@ -2142,7 +2142,7 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES + ,ADDR ,AREA_NO ,DETAIL_ADRES ,ZIP @@ -2161,7 +2161,7 @@ ,#{sexdstn_code } ,#{brthdy } ,#{fxnum } - ,#{house_adres } + ,#{addr } ,#{area_no } ,#{detail_adres } ,#{zip } @@ -2185,7 +2185,7 @@ ,SEXDSTN_CODE = #{sexdstn_code } ,BRTHDY = #{brthdy } ,FXNUM = #{fxnum } - ,HOUSE_ADRES = #{house_adres } + ,ADDR = #{addr } ,AREA_NO = #{area_no } ,DETAIL_ADRES = #{detail_adres } ,ZIP = #{zip } @@ -2229,7 +2229,7 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES + ,ADDR ,PASSWORD_HINT ,PASSWORD_CNSR ,AREA_NO @@ -2255,7 +2255,7 @@ AND SEXDSTN_CODE = #{sexdstn_code } AND BRTHDY = #{brthdy } AND FXNUM = #{fxnum } - AND HOUSE_ADRES = #{house_adres } + AND ADDR = #{addr } AND PASSWORD_HINT = #{password_hint } AND PASSWORD_CNSR = #{password_cnsr } AND AREA_NO = #{area_no } @@ -2282,7 +2282,7 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES + ,ADDR ,PASSWORD_HINT ,PASSWORD_CNSR ,AREA_NO @@ -2315,7 +2315,7 @@ , sexdstn_code , brthdy , fxnum - , house_adres + , addr , password_hint , password_cnsr , area_no @@ -2340,7 +2340,7 @@ , #{sexdstnCode} , #{brthdy} , #{fxnum} - , #{houseAdres} + , #{addr} , #{passwordHint} , #{passwordCnsr} , #{areaNo} @@ -2371,7 +2371,7 @@ ,SEXDSTN_CODE = #{sexdstn_code } ,BRTHDY = #{brthdy } ,FXNUM = #{fxnum } - ,HOUSE_ADRES = #{house_adres } + ,ADDR = #{addr } ,PASSWORD_HINT = #{password_hint } ,PASSWORD_CNSR = #{password_cnsr } ,AREA_NO = #{area_no } @@ -2407,7 +2407,7 @@ ,A.SEXDSTN_CODE ,A.BRTHDY ,A.FXNUM - ,A.HOUSE_ADRES + ,A.ADDR ,A.PASSWORD_HINT ,A.PASSWORD_CNSR ,A.AREA_NO @@ -2438,7 +2438,7 @@ AND A.SEXDSTN_CODE = #{sexdstn_code } AND A.BRTHDY = #{brthdy } AND A.FXNUM = #{fxnum } - AND A.HOUSE_ADRES = #{house_adres } + AND A.ADDR = #{addr } AND A.PASSWORD_HINT = #{password_hint } AND A.PASSWORD_CNSR = #{password_cnsr } AND A.AREA_NO = #{area_no } @@ -2469,7 +2469,7 @@ ,A.SEXDSTN_CODE ,A.BRTHDY ,A.FXNUM - ,A.HOUSE_ADRES + ,A.ADDR ,A.PASSWORD_HINT ,A.PASSWORD_CNSR ,A.AREA_NO diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml index d7c08d9c..7a9c7311 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml @@ -85,7 +85,7 @@ ,A.BRTHDY AS "brthdy" ,A.AREA_NO AS "areaNo" ,A.FXNUM AS "fxnum" - ,A.HOUSE_ADRES AS "houseAdres" + ,A.ADDR AS "addr" ,A.DETAIL_ADRES AS "detailAdres" ,A.ZIP AS "zip" ,A.OFFM_TELNO AS "offmTelno" diff --git a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml index 045d19f3..ec2dae71 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml @@ -50,7 +50,7 @@ , brthdy , area_no , fxnum - , house_adres + , addr , detail_adres , zip , offm_telno @@ -79,7 +79,7 @@ , sexdstn_code , brthdy , fxnum - , house_adres + , addr , password_hint , password_cnsr , area_no @@ -104,7 +104,7 @@ , #{sexdstnCode} , #{brthdy} , #{fxnum} - , #{houseAdres} + , #{addr} , #{passwordHint} , #{passwordCnsr} , #{areaNo} @@ -134,7 +134,7 @@ , brthdy = IF(brthdy = #{brthdy}, brthdy, #{brthdy}) , fxnum = IF(fxnum = #{fxnum}, fxnum, #{fxnum}) , zip = IF(zip = #{zip}, zip, #{zip}) - , house_adres = IF(house_adres = #{houseAdres}, house_adres, #{houseAdres}) + , addr = IF(addr = #{addr}, addr, #{addr}) , detail_adres = IF(detail_adres = #{detailAdres}, detail_adres, #{detailAdres}) , area_no = IF(area_no = #{areaNo}, area_no, #{areaNo}) , offm_telno = IF(offm_telno = #{offmTelno}, offm_telno, #{offmTelno}) @@ -361,7 +361,7 @@ , sexdstn_code , brthdy , fxnum - , house_adres + , addr , area_no , detail_adres , zip @@ -379,7 +379,7 @@ , sexdstn_code , brthdy , fxnum - , house_adres + , addr , area_no , detail_adres , zip diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 2f902d01..adb111d1 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -89,7 +89,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp index 3f071dac..32be916a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp @@ -95,7 +95,7 @@ function fnSearchAdresCallback(obj){ //화면에 출력 - document.userManageVO.houseAdres.value = obj.roadAddrPart1; + document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; document.userManageVO.detailAdres.value = totalDetailAdres; @@ -265,10 +265,10 @@ table { - - + + - + (우편번호 검색) diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp index 1dda8c73..025316e4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp @@ -164,7 +164,7 @@ - + (우편번호 검색) @@ -172,10 +172,10 @@ - + - - + + @@ -311,7 +311,7 @@ var UserForm = { totalDetailAdres += obj.roadAddrPart2; - document.userManageVO.houseAdres.value = obj.roadAddrPart1; + document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; document.userManageVO.detailAdres.value = totalDetailAdres; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp index fa70d67a..83e6affb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp @@ -210,11 +210,11 @@ table { - - + + - + (우편번호 검색) diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp index 27bb675f..f698311c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp @@ -158,8 +158,8 @@ - - + + (우편번호 검색) @@ -268,7 +268,7 @@ var XitUserRegMng_input = { // document.userManageVO // , document.userManageVO.zip // , document.userManageVO.zip_view -// , document.userManageVO.houseAdres +// , document.userManageVO.addr // ); XitUserRegMng_input.fnSearchAdres(); } @@ -404,7 +404,7 @@ var XitUserRegMng_input = { //화면에 출력 - document.userManageVO.houseAdres.value = obj.roadAddrPart1; + document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; document.userManageVO.detailAdres.value = totalDetailAdres; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp index 3b03abed..fe4e75ff 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp @@ -91,7 +91,7 @@ function fnSearchAdresCallback(obj){ //화면에 출력 - document.userManageVO.houseAdres.value = obj.roadAddrPart1; + document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; document.userManageVO.detailAdres.value = totalDetailAdres; @@ -269,11 +269,11 @@ table { - - + + - + (우편번호 검색) diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp index 60c385e6..fbf49126 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -153,8 +153,8 @@ - - + + 우편번호검색(우편번호 검색) diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js index a5d401bc..1c704af3 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js @@ -375,7 +375,7 @@ const CmmPopup = { * 
      * 주소 검색 Popup 결과를 set하는 콜백 함수
      * @param {Object} zipObj - 주소 검색 결과
-     * @param {Object} tgtObj - 주소 검색 결과값을 Set할 객체(houseAdres, zip, zip_view, detailAdres)
+     * @param {Object} tgtObj - 주소 검색 결과값을 Set할 객체(addr, zip, zip_view, detailAdres)
      *
      * ex)
      *    var fnCallbackZipSearch = (obj) => CmmPopup.fnSetZipSearch(obj, document.userInfoVO);
@@ -383,7 +383,7 @@ const CmmPopup = {
      */
     ,setZipSearch: function(zipObj, tgtObj){
         //화면에 출력
-        tgtObj.houseAdres.value   = zipObj.roadAddrPart1;
+        tgtObj.addr.value   = zipObj.roadAddrPart1;
         tgtObj.zip.value         = zipObj.zipNo;
         tgtObj.zip_view.value    = zipObj.zipNo;
         tgtObj.detailAdres.value = zipObj.roadAddrPart2 + ' ' + zipObj.addrDetail;