From 119cca45476830b6901c12417e9e9afd742161ae Mon Sep 17 00:00:00 2001
From: jjh <jaehyun81@xit.co.kr>
Date: Mon, 27 May 2024 09:36:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=82=A9=EB=B6=80=EC=9E=90=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95.?=
 =?UTF-8?q?=20=20=20-=20=EB=82=A9=EB=B6=80=EC=9E=90(TB=5FPAYER),=20?=
 =?UTF-8?q?=EB=82=A9=EB=B6=80=EC=9E=90=20=EC=A3=BC=EC=86=8C(TB=5FPAYER=5FA?=
 =?UTF-8?q?DDR)=20=ED=85=8C=EC=9D=B4=EB=B8=94=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml    |  2 +-
 .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 17 +++---
 .../sql/mapper/fims/excl/levyExcl-mapper.xml  |  7 ++-
 .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 30 +++++-----
 .../sql/mapper/fims/levy/levy-mapper.xml      | 28 +++++-----
 .../sql/mapper/fims/levy/rduct-mapper.xml     | 17 +++---
 .../sql/mapper/fims/nxrp/nisA01-mapper.xml    | 45 +++++++--------
 .../sql/mapper/fims/rcvm/rcvmt-mapper.xml     | 24 ++++----
 .../sql/mapper/fims/sndb/sndng-mapper.xml     | 56 ++++++++++---------
 .../sql/mapper/fims/sndb/sndngDtl-mapper.xml  | 17 +++---
 .../fims/sprt/integrationSearch-mapper.xml    |  2 +-
 11 files changed, 129 insertions(+), 116 deletions(-)

diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index ccbf4751..42915221 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -354,7 +354,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
   INNER JOIN TB_CRDN_ADI        CA ON (C.CRDN_ID = CA.CRDN_ID)
   INNER JOIN TB_CRDN_CVLCPT     CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)
   LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
-  LEFT OUTER JOIN TB_PAYER_ADDR PA ON (P.RTPYR_ID = PA.RTPYR_ID)
+  LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
  WHERE C.DEL_YN = 'N'
    AND C.CRDN_ID = #{crdnId}
 </select>
diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
index 2f97d1fd..e0e488b1 100644
--- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
@@ -63,14 +63,15 @@
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
-          FROM TB_CRDN_RE_REG   CRR
-         INNER JOIN TB_CRDN     C   ON (CRR.CRDN_ID = C.CRDN_ID)
-         INNER JOIN TB_CRDN_ADI CA  ON (C.CRDN_ID   = CA.CRDN_ID)
-         INNER JOIN TB_VLTN     V   ON (C.VLTN_ID   = V.VLTN_ID)
-    LEFT OUTER JOIN TB_PAYER    P   ON (C.RTPYR_ID  = P.RTPYR_ID)
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
+          FROM TB_CRDN_RE_REG     CRR
+         INNER JOIN TB_CRDN       C   ON (CRR.CRDN_ID = C.CRDN_ID)
+         INNER JOIN TB_CRDN_ADI   CA  ON (C.CRDN_ID   = CA.CRDN_ID)
+         INNER JOIN TB_VLTN       V   ON (C.VLTN_ID   = V.VLTN_ID)
+    LEFT OUTER JOIN TB_PAYER      P   ON (C.RTPYR_ID  = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA  ON (C.RTPYR_ID  = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
 	</sql>
 
 	<select id="selectCrdnReRegList" parameterType="map" resultType="dataobject">/* 단속 재등록 목록 조회(crdnReRegMapper.selectCrdnReRegList) */
diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
index 841ae3e4..6b7119fb 100644
--- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
@@ -62,9 +62,9 @@
              , P.RTPYR_NO           <!-- 납부자 번호 -->
              , P.RTPYR_NM           <!-- 납부자 명 -->
              , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL)    AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
-             , P.ZIP                <!-- 우편번호 -->
-             , P.ADDR               <!-- 주소 -->
-             , P.DTL_ADDR           <!-- 상세 주소 -->
+             , PA.ZIP               <!-- 우편번호 -->
+             , PA.ADDR              <!-- 주소 -->
+             , PA.DTL_ADDR          <!-- 상세 주소 -->
              , CC.CVLCPT_LINK_ID    <!-- 민원 연계 ID -->
              , CC.CVLCPT_RCPT_YMD   <!-- 민원 접수 일자 -->
              , CC.CVLCPT_APLY_NO    <!-- 민원 신청 번호 -->
@@ -76,6 +76,7 @@
          INNER JOIN TB_CRDN_ADI     CA  ON (C.CRDN_ID  = CA.CRDN_ID)
          INNER JOIN TB_VLTN         V   ON (C.VLTN_ID  = V.VLTN_ID)
     LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR   PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
     LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID  = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
 	</sql>
 
diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
index 498fd373..d3e79004 100644
--- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
@@ -100,21 +100,22 @@
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , P.RTPYR_NO           <!-- 납부자 번호 -->
              , P.RTPYR_NM           <!-- 납부자 명 -->
-             , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
-             , P.ZIP                <!-- 우편번호 -->
-             , P.ADDR               <!-- 주소 -->
-             , P.DTL_ADDR           <!-- 상세 주소 -->
+             , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL)    AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
+             , PA.ZIP               <!-- 우편번호 -->
+             , PA.ADDR              <!-- 주소 -->
+             , PA.DTL_ADDR          <!-- 상세 주소 -->
              , R.RDUCT_ID           <!-- 감경 ID -->
              , R.RDUCT_RSN_CD       <!-- 감경 사유 코드 -->
              , (CASE WHEN R.RDUCT_AMT IS NOT NULL THEN R.RDUCT_AMT
                      ELSE (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDUCT_RT/100 FROM TB_TASK T WHERE C.SGG_CD=T.SGG_CD AND C.TASK_SE_CD=T.TASK_SE_CD AND T.USE_YN='Y')
                  END )              AS RDUCT_AMT    <!-- 감경 금액 -->
-          FROM TB_OPNN_SBMSN    OS
-         INNER JOIN TB_CRDN     C   ON (OS.CRDN_ID = C.CRDN_ID)
-         INNER JOIN TB_CRDN_ADI CA  ON (C.CRDN_ID  = CA.CRDN_ID)
-         INNER JOIN TB_VLTN     V   ON (C.VLTN_ID  = V.VLTN_ID)
-    LEFT OUTER JOIN TB_PAYER    P   ON (C.RTPYR_ID = P.RTPYR_ID)
-    LEFT OUTER JOIN TB_RDUCT    R   ON (C.CRDN_ID  = R.CRDN_ID AND R.DEL_YN = 'N')
+          FROM TB_OPNN_SBMSN      OS
+         INNER JOIN TB_CRDN       C   ON (OS.CRDN_ID = C.CRDN_ID)
+         INNER JOIN TB_CRDN_ADI   CA  ON (C.CRDN_ID  = CA.CRDN_ID)
+         INNER JOIN TB_VLTN       V   ON (C.VLTN_ID  = V.VLTN_ID)
+    LEFT OUTER JOIN TB_PAYER      P   ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
+    LEFT OUTER JOIN TB_RDUCT      R   ON (C.CRDN_ID  = R.CRDN_ID   AND R.DEL_YN = 'N')
 	</sql>
 
 	<select id="selectOpnnSbmsnList" parameterType="map" resultType="dataobject">/* 의견제출 대장 목록 조회(opnnSbmsnMapper.selectOpnnSbmsnList) */
@@ -289,12 +290,13 @@
              , P.RTPYR_MBL_TELNO    <!-- 납부자 휴대 전화번호 -->
              , P.RTPYR_EML          <!-- 납부자 이메일 -->
              , P.RTPYR_BRDT         <!-- 납부자 생년월일 -->
-             , P.ZIP                <!-- 우편번호 -->
-             , P.ADDR               <!-- 주소 -->
-             , P.DTL_ADDR           <!-- 상세 주소 -->
+             , PA.ZIP               <!-- 우편번호 -->
+             , PA.ADDR              <!-- 주소 -->
+             , PA.DTL_ADDR          <!-- 상세 주소 -->
           FROM TB_CRDN            C
     LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
-    LEFT OUTER JOIN TB_OPNN_SBMSN OS ON (C.CRDN_ID  = OS.CRDN_ID AND OS.DEL_YN = 'N')
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
+    LEFT OUTER JOIN TB_OPNN_SBMSN OS ON (C.CRDN_ID  = OS.CRDN_ID  AND OS.DEL_YN = 'N')
 	</sql>
 
 	<select id="selectOpnnSbmsns" parameterType="map" resultType="dataobject">/* 의견제출 대장 객체 가져오기(opnnSbmsnMapper.selectOpnnSbmsns) */
diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
index b4c849ab..0780c41d 100644
--- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
@@ -154,9 +154,9 @@
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
              , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , L.LEVY_ID                <!-- 부과 ID -->
         <include refid="fromRductLevyTrgt" />
         <include refid="utility.orderBy" />
@@ -168,6 +168,7 @@
          INNER JOIN TB_VLTN         V  ON (C.VLTN_ID  = V.VLTN_ID)
     LEFT OUTER JOIN TB_CRDN_CVLCPT  CC ON (C.LINK_ID  = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
     LEFT OUTER JOIN TB_PAYER        P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR   PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
     LEFT OUTER JOIN TB_LEVY         L  ON (C.CRDN_ID  = L.CRDN_ID  AND L.DEL_YN  = 'N')
          WHERE C.SGG_CD         =  #{sggCd}             <!-- 시군구 코드 -->
            AND C.TASK_SE_CD     =  #{taskSeCd}          <!-- 업무 구분 코드 -->
@@ -266,9 +267,9 @@
                         <when test="by == 'rtpyrNm'"> P.RTPYR_NM </when>
                         <when test="by == 'rtpyrNo'"> P.RTPYR_NO </when>
                         <when test="by == 'rtpyrBrdt'"> P.RTPYR_BRDT </when>
-                        <when test="by == 'zip'"> P.ZIP </when>
-                        <when test="by == 'addr'"> P.ADDR </when>
-                        <when test="by == 'dtlAddr'"> P.DTL_ADDR </when>
+                        <when test="by == 'zip'"> PA.ZIP </when>
+                        <when test="by == 'addr'"> PA.ADDR </when>
+                        <when test="by == 'dtlAddr'"> P.ADTL_ADDR </when>
                     </choose>
                     <include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
                 </when>
@@ -410,13 +411,14 @@
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , P.RTPYR_NO       <!-- 납부자 번호 -->
              , P.RTPYR_NM       <!-- 납부자 명 -->
-             , P.ZIP            <!-- 우편번호 -->
-             , P.ADDR           <!-- 주소 -->
-             , P.DTL_ADDR       <!-- 상세 주소 -->
-          FROM TB_LEVY          L
-         INNER JOIN TB_CRDN     C  ON (L.CRDN_ID  = C.CRDN_ID)
-         INNER JOIN TB_VLTN     V  ON (C.VLTN_ID  = V.VLTN_ID)
-    LEFT OUTER JOIN TB_PAYER    P  ON (C.RTPYR_ID = P.RTPYR_ID)
+             , PA.ZIP           <!-- 우편번호 -->
+             , PA.ADDR          <!-- 주소 -->
+             , PA.DTL_ADDR      <!-- 상세 주소 -->
+          FROM TB_LEVY            L
+         INNER JOIN TB_CRDN       C  ON (L.CRDN_ID  = C.CRDN_ID)
+         INNER JOIN TB_VLTN       V  ON (C.VLTN_ID  = V.VLTN_ID)
+    LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
     </sql>
 
     <select id="selectLevyList" parameterType="map" resultType="dataobject">/* 부과 대장 목록 조회(levyMapper.selectLevyList) */
diff --git a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
index 4dbf4c52..24b7aa5c 100644
--- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
@@ -68,9 +68,9 @@
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL)    AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
              , L.LEVY_ID                <!-- 부과 ID -->
              , L.LEVY_PCPTAX            <!-- 부과 본세 -->
@@ -84,11 +84,12 @@
              , L.LEVY_PCPTAX   + L.LEVY_ADAMT   AS LEVY_AMT     <!-- 부과 금액 -->
              , L.RCVMT_PCPTAX  + L.RCVMT_ADAMT  AS RCVMT_AMT    <!-- 수납 금액 -->
              , L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT AS RDCAMT_AMT   <!-- 감액 금액 -->
-          FROM TB_RDUCT         R
-         INNER JOIN TB_CRDN     C   ON (R.CRDN_ID  = C.CRDN_ID)
-         INNER JOIN TB_CRDN_ADI CA  ON (C.CRDN_ID  = CA.CRDN_ID)
-    LEFT OUTER JOIN TB_PAYER    P   ON (C.RTPYR_ID = P.RTPYR_ID)
-    LEFT OUTER JOIN TB_LEVY     L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')
+          FROM TB_RDUCT           R
+         INNER JOIN TB_CRDN       C  ON (R.CRDN_ID  = C.CRDN_ID)
+         INNER JOIN TB_CRDN_ADI   CA ON (C.CRDN_ID  = CA.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
+    LEFT OUTER JOIN TB_LEVY       L  ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')
     </sql>
 
     <select id="selectRductList" parameterType="map" resultType="dataobject">/* 과태료 감경 대장 목록 조회(rductMapper.selectRductList) */
diff --git a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml
index e585bc36..7d8f677f 100644
--- a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml
@@ -588,31 +588,32 @@
              , P.RTPYR_MBL_TELNO        <!-- 납부자 휴대 전화번호 -->
              , P.RTPYR_EML              <!-- 납부자 이메일 -->
              , P.RTPYR_STTS_CD          <!-- 납부자 상태 코드 -->
-             , P.ADDR_SE_CD             <!-- 주소 구분 코드 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ROAD_NM_CD             <!-- 도로 명 코드 -->
-             , P.UDGD_SE_CD             <!-- 지하 구분 코드 -->
-             , P.BMNO                   <!-- 건물본번 -->
-             , P.BSNO                   <!-- 건물부번 -->
-             , P.BLDG_MNG_NO            <!-- 건물 관리 번호 -->
-             , P.STDG_CD                <!-- 법정동 코드 -->
-             , P.DONG_CD                <!-- 행정동 코드 -->
-             , P.MTN_SE_CD              <!-- 산 구분 코드 -->
-             , P.MNO                    <!-- 본번 -->
-             , P.SNO                    <!-- 부번 -->
-             , P.SPCL_DONG              <!-- 특수 동 -->
-             , P.SPCL_HO                <!-- 특수 호 -->
-             , P.SPCL_ADDR              <!-- 특수 주소 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
-             , P.WHOL_ADDR              <!-- 전체 주소 -->
+             , PA.ADDR_SE_CD            <!-- 주소 구분 코드 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ROAD_NM_CD            <!-- 도로 명 코드 -->
+             , PA.UDGD_SE_CD            <!-- 지하 구분 코드 -->
+             , PA.BMNO                  <!-- 건물본번 -->
+             , PA.BSNO                  <!-- 건물부번 -->
+             , PA.BLDG_MNG_NO           <!-- 건물 관리 번호 -->
+             , PA.STDG_CD               <!-- 법정동 코드 -->
+             , PA.DONG_CD               <!-- 행정동 코드 -->
+             , PA.MTN_SE_CD             <!-- 산 구분 코드 -->
+             , PA.MNO                   <!-- 본번 -->
+             , PA.SNO                   <!-- 부번 -->
+             , PA.SPCL_DONG             <!-- 특수 동 -->
+             , PA.SPCL_HO               <!-- 특수 호 -->
+             , PA.SPCL_ADDR             <!-- 특수 주소 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
+             , PA.WHOL_ADDR             <!-- 전체 주소 -->
              , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':'))     AS CRDN_YMD_TM_MASK <!-- 단속 일시 마스크 -->
              , (SELECT RDUCT_RSN_CD FROM TB_RDUCT X WHERE X.CRDN_ID = C.CRDN_ID AND X.DEL_YN = 'N') AS RDUCT_RSN_CD <!-- 감경 사유 코드 -->
              , <include refid="utility.today" /> AS TODAY
-          FROM TB_CRDN          C
-         INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID  = CA.CRDN_ID)
-         INNER JOIN TB_VLTN     V  ON (C.VLTN_ID  = V.VLTN_ID)
-    LEFT OUTER JOIN TB_PAYER    P  ON (C.RTPYR_ID = P.RTPYR_ID)
+          FROM TB_CRDN            C
+         INNER JOIN TB_CRDN_ADI   CA ON (C.CRDN_ID  = CA.CRDN_ID)
+         INNER JOIN TB_VLTN       V  ON (C.VLTN_ID  = V.VLTN_ID)
+    LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
          WHERE C.CRDN_ID    = #{crdnId} <!-- 단속 ID -->
            AND C.DEL_YN     = 'N'       <!-- 삭제 여부 -->
     </select>
diff --git a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
index b7deff8b..39fce3ad 100644
--- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
@@ -116,22 +116,22 @@
              , C.CRDN_PLC               <!-- 단속 장소 -->
              , C.CRDN_STTS_CD           <!-- 단속 상태 코드 -->
              , C.CRDN_STTS_CHG_DT       <!-- 단속 상태 변경 일시 -->
-             , (CONCAT(C.CRDN_YMD, C.CRDN_TM))                          AS CRDN_YMD_TM          <!-- 단속 일시 -->
-             , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM         <!-- 단속 상태 명 -->
+             , (CONCAT(C.CRDN_YMD, C.CRDN_TM))                          AS CRDN_YMD_TM  <!-- 단속 일시 -->
+             , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM <!-- 단속 상태 명 -->
              , P.RTPYR_ID               <!-- 납부자 ID -->
              , P.RTPYR_SE_CD            <!-- 납부자 구분 코드 -->
+             , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
-             , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
-             , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
-             , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
-          FROM TB_RCVMT         R
-    LEFT OUTER JOIN TB_LEVY     L   ON (R.LEVY_ID  = L.LEVY_ID)
-    LEFT OUTER JOIN TB_CRDN     C   ON (L.CRDN_ID  = C.CRDN_ID)
-    LEFT OUTER JOIN TB_PAYER    P   ON (C.RTPYR_ID = P.RTPYR_ID)
+             , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL)    AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
+          FROM TB_RCVMT           R
+    LEFT OUTER JOIN TB_LEVY       L  ON (R.LEVY_ID  = L.LEVY_ID)
+    LEFT OUTER JOIN TB_CRDN       C  ON (L.CRDN_ID  = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
     </sql>
 
     <select id="selectRcvmtList" parameterType="map" resultType="dataobject">/* 수납 대장 목록 조회(rcvmtMapper.selectRcvmtList) */
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
index bbb7cc02..b8fab58e 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
@@ -248,9 +248,9 @@
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
              , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
              , LE.LEVY_EXCL_ID          <!-- 부과 제외 ID -->
@@ -272,6 +272,7 @@
          INNER JOIN TB_VLTN         V   ON (C.VLTN_ID  = V.VLTN_ID)
     LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID  = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
     LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR   PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
     LEFT OUTER JOIN TB_LEVY_EXCL    LE  ON (C.CRDN_ID  = LE.CRDN_ID AND LE.DEL_YN = 'N')
          WHERE C.SGG_CD         =  #{sggCd}         <!-- 시군구 코드 -->
            AND C.TASK_SE_CD     =  #{taskSeCd}      <!-- 업무 구분 코드 -->
@@ -371,9 +372,9 @@
                         <when test="by == 'rtpyrNm'"> P.RTPYR_NM </when>
                         <when test="by == 'rtpyrNo'"> P.RTPYR_NO </when>
                         <when test="by == 'rtpyrBrdt'"> P.RTPYR_BRDT </when>
-                        <when test="by == 'zip'"> P.ZIP </when>
-                        <when test="by == 'addr'"> P.ADDR </when>
-                        <when test="by == 'dtlAddr'"> P.DTL_ADDR </when>
+                        <when test="by == 'zip'"> PA.ZIP </when>
+                        <when test="by == 'addr'"> PA.ADDR </when>
+                        <when test="by == 'dtlAddr'"> PA.DTL_ADDR </when>
                         <when test="by == 'cvlcptAplyNo'"> CC.CVLCPT_APLY_NO </when>
                         <when test="by == 'cvlcptRcptNo'"> CC.CVLCPT_RCPT_NO </when>
                         <when test="by == 'cvlcptRcptYmd'"> CC.CVLCPT_RCPT_YMD </when>
@@ -473,9 +474,9 @@
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
              , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
 	</sql>
@@ -486,6 +487,7 @@
          INNER JOIN TB_VLTN         V   ON (C.VLTN_ID  = V.VLTN_ID AND C.SGG_CD = V.SGG_CD AND C.TASK_SE_CD = V.TASK_SE_CD)
     LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID  = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
     LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR   PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
          WHERE C.SGG_CD     =  #{sggCd}     <!-- 시군구 코드 -->
            AND C.TASK_SE_CD =  #{taskSeCd}  <!-- 업무 구분 코드 -->
            AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD <![CDATA[ <> ]]> '00')   <!-- 민원 처리 코드 -->
@@ -585,9 +587,9 @@
                         <when test="by == 'rtpyrNm'"> P.RTPYR_NM </when>
                         <when test="by == 'rtpyrNo'"> P.RTPYR_NO </when>
                         <when test="by == 'rtpyrBrdt'"> P.RTPYR_BRDT </when>
-                        <when test="by == 'zip'"> P.ZIP </when>
-                        <when test="by == 'addr'"> P.ADDR </when>
-                        <when test="by == 'dtlAddr'"> P.DTL_ADDR </when>
+                        <when test="by == 'zip'"> PA.ZIP </when>
+                        <when test="by == 'addr'"> PA.ADDR </when>
+                        <when test="by == 'dtlAddr'"> PA.DTL_ADDR </when>
                         <when test="by == 'cvlcptAplyNo'"> CC.CVLCPT_APLY_NO </when>
                         <when test="by == 'cvlcptRcptNo'"> CC.CVLCPT_RCPT_NO </when>
                         <when test="by == 'cvlcptRcptYmd'"> CC.CVLCPT_RCPT_YMD </when>
@@ -655,17 +657,18 @@
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
              , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)  AS RTPYR_SE_NM  <!-- 납부자 구분 명 -->
              , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK  <!-- 납부자 생년월일 마스크 -->
 	</sql>
 
     <sql id="fromNhtTrgt">
-          FROM TB_LEVY          L
-         INNER JOIN TB_CRDN     C   ON (L.CRDN_ID  = C.CRDN_ID)
-    LEFT OUTER JOIN TB_PAYER    P   ON (C.RTPYR_ID = P.RTPYR_ID)
+          FROM TB_LEVY            L
+         INNER JOIN TB_CRDN       C  ON (L.CRDN_ID  = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER      P  ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
          WHERE L.SGG_CD     =  #{sggCd}     <!-- 시군구 코드 -->
            AND L.TASK_SE_CD =  #{taskSeCd}  <!-- 업무 구분 코드 -->
         <if test="levyIds != null">
@@ -771,9 +774,9 @@
              , P.RTPYR_NO               <!-- 납부자 번호 -->
              , P.RTPYR_NM               <!-- 납부자 명 -->
              , P.RTPYR_BRDT             <!-- 납부자 생년월일 -->
-             , P.ZIP                    <!-- 우편번호 -->
-             , P.ADDR                   <!-- 주소 -->
-             , P.DTL_ADDR               <!-- 상세 주소 -->
+             , PA.ZIP                   <!-- 우편번호 -->
+             , PA.ADDR                  <!-- 주소 -->
+             , PA.DTL_ADDR              <!-- 상세 주소 -->
              , L.LEVY_ID                <!-- 부과 ID -->
              , L.INST_CD                <!-- 기관 코드 -->
              , L.DEPT_CD                <!-- 부서 코드 -->
@@ -852,11 +855,12 @@
              , L.LEVY_PCPTAX - L.RCVMT_PCPTAX - L.RDCAMT_PCPTAX AS PCPTAX       <!-- 본세 -->
              , L.LEVY_ADAMT  - L.RCVMT_ADAMT  - L.RDCAMT_ADAMT  AS ADAMT        <!-- 가산금 -->
           FROM TB_CRDN              C
-         INNER JOIN TB_CRDN_ADI     CA  ON (C.CRDN_ID   = CA.CRDN_ID)
-         INNER JOIN TB_VLTN         V   ON (C.VLTN_ID   = V.VLTN_ID)
-    LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID   = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
-    LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID  = P.RTPYR_ID)
-    LEFT OUTER JOIN TB_LEVY         L   ON (C.CRDN_ID   = L.CRDN_ID AND L.DEL_YN = 'N')
+         INNER JOIN TB_CRDN_ADI     CA  ON (C.CRDN_ID  = CA.CRDN_ID)
+         INNER JOIN TB_VLTN         V   ON (C.VLTN_ID  = V.VLTN_ID)
+    LEFT OUTER JOIN TB_CRDN_CVLCPT  CC  ON (C.LINK_ID  = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N')
+    LEFT OUTER JOIN TB_PAYER        P   ON (C.RTPYR_ID = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR   PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
+    LEFT OUTER JOIN TB_LEVY         L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')
     </sql>
 
     <select id="selectCrdnPayerTrgts" parameterType="map" resultType="dataobject">/* 단속, 납부자, 부과 대장 객체 가져오기(sndngMapper.selectCrdnPayerTrgts) */
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
index 980d2d38..d1945f14 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
@@ -765,9 +765,9 @@
              , P.RTPYR_SE_CD        <!-- 납부자 구분 코드 -->
              , P.RTPYR_NO           <!-- 납부자 번호 -->
              , P.RTPYR_NM           <!-- 납부자 명 -->
-             , P.ZIP                <!-- 우편번호 -->
-             , P.ADDR               <!-- 주소 -->
-             , P.DTL_ADDR           <!-- 상세 주소 -->
+             , PA.ZIP               <!-- 우편번호 -->
+             , PA.ADDR              <!-- 주소 -->
+             , PA.DTL_ADDR          <!-- 상세 주소 -->
              , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL)      AS RTPYR_SE_NM      <!-- 납부자 구분 명 -->
         <include refid="fromSndbk" />
         <include refid="utility.orderBy" />
@@ -775,11 +775,12 @@
     </select>
 
     <sql id="fromSndbk">
-          FROM TB_SNDNG_DTL         SD
-         INNER JOIN TB_CRDN         C   ON  (SD.CRDN_ID  = C.CRDN_ID)
-    LEFT OUTER JOIN TB_PAYER        P   ON  (C.RTPYR_ID  = P.RTPYR_ID)
-    LEFT OUTER JOIN TB_SNDNG        S   ON  (SD.SNDNG_ID = S.SNDNG_ID)
-    LEFT OUTER JOIN TB_EPOST_DLVR_RSLT  EDR ON (SD.CON_KEY = EDR.CON_KEY AND SD.RG_NO = EDR.REGINO)
+          FROM TB_SNDNG_DTL             SD
+         INNER JOIN TB_CRDN             C   ON (SD.CRDN_ID  = C.CRDN_ID)
+    LEFT OUTER JOIN TB_PAYER            P   ON (C.RTPYR_ID  = P.RTPYR_ID)
+    LEFT OUTER JOIN TB_PAYER_ADDR       PA  ON (C.RTPYR_ID  = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)
+    LEFT OUTER JOIN TB_SNDNG            S   ON (SD.SNDNG_ID = S.SNDNG_ID)
+    LEFT OUTER JOIN TB_EPOST_DLVR_RSLT  EDR ON (SD.CON_KEY  = EDR.CON_KEY AND SD.RG_NO  = EDR.REGINO)
          WHERE C.SGG_CD             =  #{sggCd}
            AND C.TASK_SE_CD         =  #{taskSeCd}
            AND (SD.SVBTC_ID         IS NULL OR SD.SVBTC_ID       = '')
diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
index 32e59a1c..42938c35 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -161,7 +161,7 @@ LEFT OUTER JOIN TB_LEVY_EXCL     LE  ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN =
 LEFT OUTER JOIN TB_ESB_INTERFACE EI  ON (C.LINK_TBL_NM = 'TB_ESB_INTERFACE' AND C.LINK_ID = EI.INTERFACE_SEQ_N) /* 국민신문고 민원 연계 */
 LEFT OUTER JOIN TB_SA_CVLCPT_DTL SCD ON (C.LINK_TBL_NM = 'TB_SA_CVLCPT_DTL' AND C.LINK_ID = SCD.DTL_ID)         /* 새올 민원 연계 */
 LEFT OUTER JOIN TB_PAYER         P   ON (C.RTPYR_ID = P.RTPYR_ID)                                           /* 납부자 대장 */
-LEFT OUTER JOIN TB_PAYER_ADDR    PA  ON (P.RTPYR_ID = PA.RTPYR_ID)
+LEFT OUTER JOIN TB_PAYER_ADDR    PA  ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN)               /* 납부자 주소 대장 */
 LEFT OUTER JOIN TB_LEVY          L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = 'N')                         /* 부과 대장 */
 LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N')                          /* 수납 대장 */
      WHERE C.DEL_YN = 'N'