Merge branch 'iipbs/sn/dev'

apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx

@@ -1116,6 +1116,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
               onPageChange={setCurPage}
               resetPageNo={isResetPage}
               resetSelection={isResetSelection}
+              curPage={curPage}
               headButton={
                 <div className='flex'>
                   <Button className="px-4 py-2 !mr-[1.2rem] text-white rounded-sm text-lg font-medium primary" size="sm" onClick={viewMultipleFeature}>지도에서 보기</Button>
@@ -1147,6 +1148,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 onPageChange={setCurPage}
                 resetPageNo={isResetPage}
                 resetSelection={isResetSelection}
+                curPage={curPage}
                 headButton={
                   <Button className="px-4 py-2 !mr-[1.2rem] text-white rounded-sm text-sm font-medium green" size="sm" onClick={operationExcelDownload}>파일 다운로드</Button>
                 }
@@ -1173,6 +1175,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 onPageChange={setDetailCurPage}
                 resetPageNo={isResetDetailPage}
                 resetSelection={isResetDetailSelection}
+                curPage={detailCurPage}
                 headButton={
                   <div className='flex'>
                     <Button className="px-4 py-2 !mr-[1.2rem] text-white rounded-sm text-lg font-medium primary" size="sm" onClick={viewMultipleFeature}>지도에서 보기</Button>

packages/common/business_components/src/ui/table/index.tsx

@@ -30,6 +30,7 @@ type UiTableProps = {
   boldArray?: number[];
   resetSelection?: boolean;
   index?: number;
+  curPage?: number;
   headButton?: React.ReactNode | undefined;
 };
 
@@ -54,9 +55,10 @@ export function UiTable({
   boldArray = [],
   resetSelection = false,
   index = -1,
+  curPage = 1,
   headButton = undefined,
 }: UiTableProps) {
-  const [cur, setCur] = useState<number>(1);
+  const [cur, setCur] = useState<number>(curPage);
   const [idx, setIdx] = useState<number>(index);
   const [headerHeight, setHeaderHeight] = useState<number>(0);
   const headerRef = useRef<HTMLTableSectionElement>(null);
@@ -84,6 +86,10 @@ export function UiTable({
     setIdx(index);
   }, [index])
 
+  useEffect(() => {
+    setCur(curPage);
+  }, [curPage])
+
   const handlePageChange = (page: number) => {
     setCur(page);
     onPageChange(page);