diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
index edf8cde..bb5c6b3 100644
--- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
+++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
@@ -181,7 +181,7 @@
 			FROM   TBL_DISTRICT
 			WHERE  (GM_CODE IS NULL OR (GL_CODE = '08' AND GM_CODE IN (SELECT MASTER_COMPANY_TW_CODE 
 			                                                           FROM   TEMP_CONSTRUCT_SITE_INFO 
-			                                                           WHERE MASTER_COMPANY_O_CODE = '08')))
+			                                                           WHERE  MASTER_COMPANY_O_CODE = '08')))
 			AND    USE_YN = 'Y' 
 			AND    GL_CODE IN (SELECT MASTER_COMPANY_O_CODE 
 			                   FROM   TEMP_CONSTRUCT_SITE_INFO)
@@ -193,6 +193,8 @@
 			       GL_CODE AS PARENT_CODE_VALUE
 			FROM   TBL_DISTRICT
 			WHERE  GS_CODE IS NULL
+			AND    GM_CODE IN (SELECT MASTER_COMPANY_TW_CODE 
+			                   FROM   TEMP_CONSTRUCT_SITE_INFO)
 			AND    GM_CODE IS NOT NULL
 			AND    GL_CODE<>'00'
 			AND    GM_CODE<>'00'
@@ -205,8 +207,9 @@
 			       GL_CODE||GM_CODE AS  PARENT_CODE_VALUE
 			FROM   TBL_DISTRICT
 			WHERE  GF_CODE IS NULL
-			AND    GS_CODE IS NOT NULL
-			AND GL_CODE<>'00'
+			AND    GL_CODE||GM_CODE||GS_CODE IN (SELECT MASTER_COMPANY_O_CODE||MASTER_COMPANY_TW_CODE||MASTER_COMPANY_TH_CODE 
+			                   FROM   TEMP_CONSTRUCT_SITE_INFO)
+			AND    GL_CODE<>'00'
 			AND    GM_CODE<>'00'
 			AND    GS_CODE<>'000'
 			AND    USE_YN = 'Y'