diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx index 03ddd5661..53c3e4403 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx @@ -66,6 +66,8 @@ export default function Home() { return { ...item, archArea: archArea, + cityText: item.ctpvCd === 0 ? "세종특별자치시" : (item as any).cityText, + sggText: (item as any).sggText === "없음" ? "-" : (item as any).sggText, }; } ); diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx index 880b3d8a7..45844a7b7 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx @@ -78,10 +78,11 @@ export default function Home() { archArea: formatArchArea(item?.archArea, 1), bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N", frstArchPrmsnDt: item?.frstArchPrmsnDt || "확인불가", + cityText: item.ctpvCd === 0 ? "세종특별자치시" : (item as any).cityText, + sggText: (item as any).sggText === "없음" ? "-" : (item as any).sggText, }; } ); - setbdstTable(rainData); } else { setbdstTable([]); diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx index 470d6e1d6..4dcf82d70 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx @@ -80,6 +80,8 @@ export default function Home() { archArea: archArea, bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N", bdstUsgCd: item.reuseBuilding[0]?.bdstUsgCd, + cityText: item.ctpvCd === 0 ? "세종특별자치시" : (item as any).cityText, + sggText: (item as any).sggText === "없음" ? "-" : (item as any).sggText, }; } ); diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx index cdaccf94f..1b92b025e 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx @@ -171,7 +171,6 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = ( `/reuseFc/rainyInfoList/${pageNation}/${rainRegSize}/${code}` + (txt ? `/${txt}` : "") ); - console.log("rainRes", rainRes); set((state: rainFacState) => { return { rain: { diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx index 0445a3e2e..11ce1b6f4 100644 --- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx +++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx @@ -77,7 +77,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) { useEffect(() => { const city = String(userCtpvCd); - if (city && city === "0") { + if (city && (city === "0" || city === "50")) { setUserSggCd([{ text: "전체", val: "0" }]); form.setValue("sggCd", 0, { diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx index fb2754050..9d349a6dd 100644 --- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx +++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx @@ -122,10 +122,15 @@ export function BdstReg({ setUserSggCd([{ text: "전체", val: "0" }]); setObjSearch({ ...objSearch, sgg: "0" }); } else if (city.length === 2) { - const sgg = code.sggCd.filter((item) => item.val.slice(0, 2) === city); - //sgg.unshift({ text: "전체", val: "0" }); - setUserSggCd(sgg); - setObjSearch({ ...objSearch, sgg: Number(sgg[0]?.val) }); + if (city === "50") { + setUserSggCd([{ text: "전체", val: "0" }] as SelectDataType[]); + setObjSearch({ ...objSearch, sgg: "0" }); + } else { + const sgg = code.sggCd.filter((item) => item.val.slice(0, 2) === city); + //sgg.unshift({ text: "전체", val: "0" }); + setUserSggCd(sgg); + setObjSearch({ ...objSearch, sgg: Number(sgg[0]?.val) }); + } } }, [objSearch.city]);