diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 2fd1c2d55..d3dbb9ed1 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -73,8 +73,18 @@ export default function PbnstSttn() { !isAllAreaUser && laeSeCd?.length === 5 ? laeSeCd : "0"; const getFixedSearchValue = useCallback( (baseValue: ReturnType): ReturnType => { + const cleanedValue = { ...baseValue }; + + // 유역(R) 탭 선택 시, 이전 행정구역 탭에서 선택된 시군구 값이 남아있어 + // 검색 결과가 시군구로 필터링되는 현상을 방지하기 위해 sigunValue를 '0'으로 초기화합니다. + if (cleanedValue.partValue === "R"|| cleanedValue.partValue === "G") { + cleanedValue.sigunValue = "0"; + cleanedValue.sigunText = ""; + } + if (isAllAreaUser) { - return baseValue; + // console.log("isAllAreaUser is true"); + return cleanedValue; } const fixedSidoText = @@ -85,7 +95,7 @@ export default function PbnstSttn() { : ""; return { - ...baseValue, + ...cleanedValue, partValue: "A", sidoValue: fixedSidoValue, sigunValue: fixedSigunValue, @@ -338,4 +348,3 @@ export default function PbnstSttn() { ); } - diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index ee94ada00..48c1e965d 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -298,6 +298,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( fclts: string[] ) => { try { + console.log(reurnValue); const pbnstSttnRes = await hasuListFetch( page, total, diff --git a/packages/common/business_components/src/ui/search_base_form/index.tsx b/packages/common/business_components/src/ui/search_base_form/index.tsx index e4fef1e1e..43276a457 100644 --- a/packages/common/business_components/src/ui/search_base_form/index.tsx +++ b/packages/common/business_components/src/ui/search_base_form/index.tsx @@ -10,9 +10,9 @@ type SearchBaseType = { rightChildren:React.ReactNode; selectSidoData?: SelectDataType[] | []; selectSigunData?: SelectDataType[] | []; - selectRegionData?: SelectDataType[] | []; - selectUnitWaterShedData?: SelectDataType[] | []; - selectMiddleRegionData?: SelectDataType[] | []; + selectRegionData?: SelectDataType[] | []; // 유역 코드 + selectUnitWaterShedData?: SelectDataType[] | []; // 단위유역 코드 + selectMiddleRegionData?: SelectDataType[] | []; // 중권역 코드 selectEnvPartData?: EnvPartSelectDataType[] | []; queryClick:(returnType:ReturnType) => void; excelName?:string;