feat: 발주기관 사용자가 자신의 프로젝트만 검색되도록 수정

src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java

@@ -10,5 +10,5 @@ public interface DrillingHomeService {
 	public List<EgovMap> drillingMapSearchHole(String projectCode);
 	public List<EgovMap> drillingMapSearchHoleWithMbr(HashMap<String, Object> params);
 	
-	public String projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception;
+	public List<String> projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception;
 }

src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java

@@ -45,7 +45,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
 	}
 
 	@Override
-	public String projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception {
+	public List<String> projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception {
 		if( params.get("COM_CODE") == null ) {
 			throw new Exception("comCode 값은 필수입니다.");
 		}
@@ -59,6 +59,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
 	    if (projectCodes == null || projectCodes.isEmpty()) {
 	        return null;
 	    }
+	    /*
 
 	    // 2. StringBuilder를 사용해 쉼표(,)로 문자열을 조합합니다.
 	    StringBuilder sb = new StringBuilder();
@@ -71,6 +72,9 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
 	    
 	    // 3. 조합된 문자열을 반환합니다.
 	    return sb.toString();
+	    */
+	    
+	    return projectCodes;
 	}
       
 

src/main/java/geoinfo/map/left/MapLeftController.java

@@ -328,16 +328,16 @@ public class MapLeftController {
 
 		// 발주기관 프로젝트 코드만 조회
 		String masterCompanyCode = null;
-		String masterCompanyProjectCodes = null;
+		List<String> masterCompanyProjectCodes = null;
 		if( params.get("masterCompanyCode") != null ) {
 			masterCompanyCode = GeoinfoCommon.parseData(params.get("masterCompanyCode").toString().trim());
 
-			HashMap<String, Object> paramsMasterCompanyCode = new HashMap<String, Object>();
+			//HashMap<String, Object> paramsMasterCompanyCode = new HashMap<String, Object>();
-			paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode);
+			//paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode);
-			masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode);
+			//masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode);
 
 			params.put("masterCompanyCode", masterCompanyCode);
-			params.put("masterCompanyProjectCodes", masterCompanyProjectCodes);
+			//params.put("masterCompanyProjectCodes", masterCompanyProjectCodes);
 		}
 
 

src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java

@@ -55,7 +55,6 @@ public class MapLeftServiceImpl implements MapLeftService{
 
 	@Override
 	public List<EgovMap> getAllAreaSearchList(Map<String, Object> params) throws Exception {
-		params.get("");
 		return mapLeftMapper.getAllAreaSearchList(params);
 	}
 

src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml

@@ -15,6 +15,11 @@
 			<![CDATA[
 				NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
 			]]>
+			
+			<if test="masterCompanyCode != null">
+			    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+			</if>
+			
 			<if test="tmX != ''">
 				<![CDATA[
 					AND HOLE_LOCATION_TM_X - 100 <= #{tmX}
@@ -48,6 +53,10 @@
 				]]>
 				A.PROJECT_CODE = B.PROJECT_CODE
 			
+			<if test="masterCompanyCode != null">
+			    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+			</if>
+		
 			<if test="tmX != ''">
 				<![CDATA[
 					AND DECODE(sign(HOLE_LOCATION_TM_X),-1,FLOOR(HOLE_LOCATION_TM_X)+1,FLOOR(HOLE_LOCATION_TM_X))-100 <= #{tmX}

src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml

@@ -24,6 +24,10 @@
 					AND NVL(A.USE_YN,' ') <> 'N'
 		]]>
 
+		<if test="masterCompanyCode != null">
+		    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+		</if>
+		
 		<if test="gugun != 'all'">
 				<![CDATA[
 					AND (B.HOLE_LOCATION_TM_X  >= C.MINX AND B.HOLE_LOCATION_TM_X  <= C.MAXX)
@@ -61,6 +65,10 @@
 					NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
 				AND NVL(A.USE_YN,' ') <> 'N'
 		]]>
+		
+		<if test="masterCompanyCode != null">
+		    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+		</if>
 
 		<if test="gugun != 'all'">
 				<![CDATA[
@@ -161,7 +169,10 @@
 								WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
 								AND NVL(A.USE_YN,' ') <> 'N'
 							]]>
-
+		<if test="masterCompanyCode != null">
+		    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+		</if>
+		
 		<if test="gugun != 'all'">
 								<![CDATA[
 									AND (B.HOLE_LOCATION_TM_X  >= C.MINX AND B.HOLE_LOCATION_TM_X  <= C.MAXX)
@@ -216,10 +227,8 @@
 								AND NVL(A.USE_YN,' ') <> 'N'
 							]]>
 
-		<if test="masterCompanyCode != null and masterCompanyProjectCodes != null and masterCompanyProjectCodes !=''">
+		<if test="masterCompanyCode != null">
-							<![CDATA[
+		    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
-							AND TRIM(a.PROJECT_CODE) IN( ${masterCompanyProjectCodes} )
-							]]>
 		</if>
 
 		<if test="gugun != 'all'">

src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml

@@ -29,6 +29,10 @@
 				]]>
 			</if>
 	
+			<if test="masterCompanyCode != null">
+			    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+			</if>
+			
 			<if test="comClass != 'all'">
 				<![CDATA[
 					AND A.PROJECT_WORK_COMPANY_CODE = #{comClass}
@@ -431,6 +435,11 @@
 									NVL(A.USE_YN,' ') <> 'N'
 		]]>
 
+	
+								<if test="masterCompanyCode != null">
+								    AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
+								</if>
+			
 
 								<if test="pName != ''">
 									<![CDATA[

src/main/webapp/js/map/main/left/left.js

@@ -517,6 +517,11 @@ function onSichCheck() {
 	searchSichuForm.isArea.value = "0";
 
 	var params = $("#searchSichuForm").serialize();
+	
+
+	if( getQueryString("masterCompanyCode") ) {
+		params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
+	}
 
 	$.ajax({
 		url : "/map/mapSearchArea.do",
@@ -541,6 +546,10 @@ function onSaupCheck() {
 
 	var params = $("#searchSaupForm").serialize();
 
+	if( getQueryString("masterCompanyCode") ) {
+		params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
+	}
+	
 	$.ajax({
 		url : "/map/projectSearch.do",
 		method : "post",
@@ -626,7 +635,13 @@ function resultxyForm() {
 			}
 			openWaitWin();
 
-			var params = $("#searchLocateForm").serialize();
+			var params = $("#searchLocateForm").serialize();			
+
+
+			if( getQueryString("masterCompanyCode") ) {
+				params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
+			}
+			
 			var numberTrue = params;
 
 			if( (Object.is((Number(f.tmx.value) ), NaN)) || (Object.is((Number(f.tmy.value) ), NaN))      ){