From 30f49d426455520b7855dd5b1ba0f469e040d6b1 Mon Sep 17 00:00:00 2001
From: suyeon <whtndus0809@naver.com>
Date: Thu, 15 May 2025 18:17:00 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EA=B3=A0=EA=B0=9D=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerInfo/CustomerInfo.tsx             |  6 +--
 .../Tables/ContractTable.tsx                  | 41 ++++++++-----------
 .../Tables/PropertyTable.tsx                  | 41 ++++++++-----------
 3 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/src/pages/CustomerDetailPage/CustomerInfo/CustomerInfo.tsx b/src/pages/CustomerDetailPage/CustomerInfo/CustomerInfo.tsx
index 45840e3..f015066 100644
--- a/src/pages/CustomerDetailPage/CustomerInfo/CustomerInfo.tsx
+++ b/src/pages/CustomerDetailPage/CustomerInfo/CustomerInfo.tsx
@@ -80,19 +80,19 @@ function CustomerInfo({ customerId }: { customerId: string }) {
   const [loading, setLoading] = useState(false);
 
   // Consultation 관련 상태
-  const [counselPage, setCounselPage] = useState(1);
+  const [counselPage, setCounselPage] = useState(0);
   const [counselRowsPerPage, setCounselRowsPerPage] = useState(10);
   const [counselTotalCount, setCounselTotalCount] = useState(0);
   const [counselLoading, setCounselLoading] = useState(false);
 
   // Property 관련 상태
-  const [propertyPage, setPropertyPage] = useState(1);
+  const [propertyPage, setPropertyPage] = useState(0);
   const [propertyRowsPerPage, setPropertyRowsPerPage] = useState(10);
   const [propertyTotalCount, setPropertyTotalCount] = useState(0);
   const [propertyLoading, setPropertyLoading] = useState(false);
 
   // Contract 관련 상태
-  const [contractPage, setContractPage] = useState(1);
+  const [contractPage, setContractPage] = useState(0);
   const [contractRowsPerPage, setContractRowsPerPage] = useState(10);
   const [contractTotalCount, setContractTotalCount] = useState(0);
   const [contractLoading, setContractLoading] = useState(false);
diff --git a/src/pages/CustomerDetailPage/Tables/ContractTable.tsx b/src/pages/CustomerDetailPage/Tables/ContractTable.tsx
index 4ae184f..8941e76 100644
--- a/src/pages/CustomerDetailPage/Tables/ContractTable.tsx
+++ b/src/pages/CustomerDetailPage/Tables/ContractTable.tsx
@@ -15,6 +15,7 @@ import {
   TableRow,
   Chip,
   CircularProgress,
+  TablePagination,
 } from "@mui/material";
 
 interface ContractTableProps {
@@ -194,31 +195,21 @@ function ContractTable({
         <Typography variant="body2" color="text.secondary">
           총 {totalCount}건
         </Typography>
-        <Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>
-          <FormControl size="small" sx={{ minWidth: 120 }}>
-            <InputLabel>페이지당 행</InputLabel>
-            <Select
-              value={rowsPerPage}
-              label="페이지당 행"
-              onChange={(e) => {
-                onRowsPerPageChange(Number(e.target.value));
-              }}
-            >
-              <MenuItem value={10}>10</MenuItem>
-              <MenuItem value={25}>25</MenuItem>
-              <MenuItem value={50}>50</MenuItem>
-              <MenuItem value={100}>100</MenuItem>
-            </Select>
-          </FormControl>
-          <Pagination
-            count={Math.ceil(totalCount / rowsPerPage)}
-            page={page}
-            onChange={(_, newPage) => onPageChange(newPage)}
-            color="primary"
-            showFirstButton
-            showLastButton
-          />
-        </Box>
+        <TablePagination
+          component="div"
+          count={totalCount}
+          page={page}
+          rowsPerPage={rowsPerPage}
+          onPageChange={(_, newPage) => onPageChange(newPage)}
+          onRowsPerPageChange={(e) => {
+            onRowsPerPageChange(Number(e.target.value));
+          }}
+          rowsPerPageOptions={[10, 25, 50, 100]}
+          labelRowsPerPage="페이지당 행 수"
+          labelDisplayedRows={({ from, to, count }) =>
+            `${count}건 중 ${from}-${to}건`
+          }
+        />
       </Box>
     </Paper>
   );
diff --git a/src/pages/CustomerDetailPage/Tables/PropertyTable.tsx b/src/pages/CustomerDetailPage/Tables/PropertyTable.tsx
index 86b5150..7543742 100644
--- a/src/pages/CustomerDetailPage/Tables/PropertyTable.tsx
+++ b/src/pages/CustomerDetailPage/Tables/PropertyTable.tsx
@@ -15,6 +15,7 @@ import {
   Paper,
   Chip,
   CircularProgress,
+  TablePagination,
 } from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import { formatPriceWithKorean } from "@utils/numberUtil";
@@ -192,31 +193,21 @@ function PropertyTable({
         <Typography variant="body2" color="text.secondary">
           총 {totalCount}건
         </Typography>
-        <Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>
-          <FormControl size="small" sx={{ minWidth: 120 }}>
-            <InputLabel>페이지당 행</InputLabel>
-            <Select
-              value={rowsPerPage}
-              label="페이지당 행"
-              onChange={(e) => {
-                onRowsPerPageChange(Number(e.target.value));
-              }}
-            >
-              <MenuItem value={10}>10</MenuItem>
-              <MenuItem value={25}>25</MenuItem>
-              <MenuItem value={50}>50</MenuItem>
-              <MenuItem value={100}>100</MenuItem>
-            </Select>
-          </FormControl>
-          <Pagination
-            count={Math.ceil(totalCount / rowsPerPage)}
-            page={page}
-            onChange={(_, newPage) => onPageChange(newPage)}
-            color="primary"
-            showFirstButton
-            showLastButton
-          />
-        </Box>
+        <TablePagination
+          component="div"
+          count={totalCount}
+          page={page}
+          rowsPerPage={rowsPerPage}
+          onPageChange={(_, newPage) => onPageChange(newPage)}
+          onRowsPerPageChange={(e) => {
+            onRowsPerPageChange(Number(e.target.value));
+          }}
+          rowsPerPageOptions={[10, 25, 50, 100]}
+          labelRowsPerPage="페이지당 행 수"
+          labelDisplayedRows={({ from, to, count }) =>
+            `${count}건 중 ${from}-${to}건`
+          }
+        />
       </Box>
     </Paper>
   );

From 2fdb73c7e07088d959a05e804bab49ace95641a1 Mon Sep 17 00:00:00 2001
From: suyeon <whtndus0809@naver.com>
Date: Thu, 15 May 2025 18:21:46 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EA=B3=84=EC=95=BD=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EC=A3=BC=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractEditModal/ContractEditModal.tsx                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/ContractListPage/ContractAddButtonList/ContractEditModal/ContractEditModal.tsx b/src/pages/ContractListPage/ContractAddButtonList/ContractEditModal/ContractEditModal.tsx
index ded052f..7cf637a 100644
--- a/src/pages/ContractListPage/ContractAddButtonList/ContractEditModal/ContractEditModal.tsx
+++ b/src/pages/ContractListPage/ContractAddButtonList/ContractEditModal/ContractEditModal.tsx
@@ -135,9 +135,12 @@ const ContractEditModal = ({
           .filter((uid: number | null): uid is number => uid !== null)
       );
 
+      const normalize = (str?: string) => str?.trim().replace(/\s+/g, "") ?? "";
+
       const matchedProperty = allProperties.find(
-        (p) => p.address === data.propertyAddress
+        (p) => normalize(p.address) === normalize(data.propertyAddress)
       );
+
       setPropertyUid(matchedProperty ? matchedProperty.uid : null);
 
       setCategory(