diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index ef5c21d5b..880c116cd 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -46,7 +46,7 @@ function Gis({
 	const gisCore = useMemo(() => new GisApp.core({ targetId: mapRef.current }), []);
 	const mapInstanceRef = useRef(null);
 	const checkedLayerIds = useRef([]);
-	
+	const layerNmRef = useRef('')
 
 	// 팝업 데이터를 저장할 상태와 오버레이 참조를 저장할 ref 추가
 	// const [facilityInfoPopupData, setFacilityInfoPopupData] = useState([]);
@@ -84,12 +84,32 @@ function Gis({
 			foundFeature = data;
 		} else {
 			// 아니면 featureId로 맵에서 Feature 인스턴스를 찾아서 사용
-			const featureId = data.fid || data.ftrIdn || data.id;
+			let featureId
+			const layerName = layerNmRef.current
+			if (layerName === '하수재이용시설') {
+				featureId = data.searchPk;
+			  } else if (layerName === '빗물이용시설') {
+				featureId = data.bdstInfoPk;
+			  } else if (layerName === '하수처리시설') {
+				featureId = data.bscFctCd;
+			  } else if (layerName === '중수도시설' || layerName == '온배수시설') {
+				featureId = data.bdstRuseFcltPk;
+			  } else {
+				console.warn('해당 레이어에 대한 featureId 매핑 없음', layerNm);
+				featureId = data.fid || data.id || data.ftrIdn;
+			  }
 			gisMap.getLayers().getArray().forEach(layer => {
 				const source = layer.getSource?.();
-				if (source?.getFeatureById) {
-					const feature = source.getFeatureById(String(featureId).trim());
-					if (feature) foundFeature = feature;
+				if (source?.getFeatures) {
+					const allFeatures = source.getFeatures();
+					for (const f of allFeatures) {
+						const id = String(f.getId());
+						// console.log('id', id, featureId)
+						if (id && id.split('.')[1] === String(featureId)) {
+							foundFeature = f;
+							break;
+						}
+					}
 				}
 			});
 		}
@@ -360,6 +380,7 @@ function Gis({
 						setVisible={setTabVisible}
 						onCheckedChange={handleCheckedLayersChange}
 						onLayerIconClick={(nodeNm) => {
+							layerNmRef.current = nodeNm
 							setLayerNm(nodeNm); setIsOpen(true); const dummyFeature = {
 								getProperties: () => ({}),  // 최소 구조
 							};
@@ -375,6 +396,7 @@ function Gis({
 							featureData={featureData || { getProperties: () => ({}) }}
 							seletectedLayerNm={layerNm}
 							onClose={closePopup} // 닫기 콜백 전달
+							onFeatureSelect={handleFeatureSelect}
 						/>
 					)}
 					{/* SearchView가 존재할 때만 렌더링 */}