From acee57f819bb66646023a13119ff4ecfd625f6fd Mon Sep 17 00:00:00 2001
From: "focp212@naver.com" <focp212@naver.com>
Date: Thu, 30 Oct 2025 11:06:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/account/ui/user-manage-wrap.tsx        | 13 +++++++++----
 .../merchant/ui/registration-status-wrap.tsx        |  6 +++---
 src/entities/payment/ui/info-wrap.tsx               |  4 ++--
 src/entities/payment/ui/notification-data-wrap.tsx  |  9 +++++++--
 .../password/modify-cancel-password-page.tsx        |  9 ++++++---
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/entities/account/ui/user-manage-wrap.tsx b/src/entities/account/ui/user-manage-wrap.tsx
index 56c2dc7..53d3ad1 100644
--- a/src/entities/account/ui/user-manage-wrap.tsx
+++ b/src/entities/account/ui/user-manage-wrap.tsx
@@ -11,10 +11,13 @@ import { useStore } from '@/shared/model/store';
 export const UserManageWrap = () => {
   const { t } = useTranslation();
   const { navigate } = useNavigate();
-  const midOptions = useStore.getState().UserStore.selectOptionsMids;
+  const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids;
   const userMid = useStore.getState().UserStore.mid;
+  let midItem = midOptionsWithoutGids.filter((value, index) => {
+    return value.value === userMid;
+  });
   
-  const [mid, setMid] = useState<string>(userMid);
+  const [mid, setMid] = useState<string>((midItem.length > 0)? userMid: '');
   const [userItems, setUserItems] = useState<Array<UserListItem>>([]);
   const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
   
@@ -38,7 +41,9 @@ export const UserManageWrap = () => {
   };
 
   useEffect(() => {
-    callList();
+    if(!!mid){
+      callList();
+    }
   }, [mid]);
   
   return (
@@ -52,7 +57,7 @@ export const UserManageWrap = () => {
               onChange={ (e: ChangeEvent<HTMLSelectElement>) => setMid(e.target.value)}
             >
             {
-              midOptions.map((value, index) => (
+              midOptionsWithoutGids.map((value, index) => (
                 <option
                   key={ value.value }
                   value={ value.value }
diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx
index 1d95112..80b757f 100644
--- a/src/entities/merchant/ui/registration-status-wrap.tsx
+++ b/src/entities/merchant/ui/registration-status-wrap.tsx
@@ -17,9 +17,9 @@ import { useStore } from '@/shared/model/store';
 
 export const RegistrationStatusWrap = () => {
   const { t } = useTranslation();
-  const midOptions = useStore.getState().UserStore.selectOptionsMidsWithoutGids;
+  const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids;
   const userMid = useStore.getState().UserStore.mid;
-  let midItem = midOptions.filter((value, index) => {
+  let midItem = midOptionsWithoutGids.filter((value, index) => {
     return value.value === userMid;
   });
 
@@ -58,7 +58,7 @@ export const RegistrationStatusWrap = () => {
           onChange={ (e: ChangeEvent<HTMLSelectElement>) => setMid(e.target.value) }
         >
         { 
-          midOptions.map((value, index) => (
+          midOptionsWithoutGids.map((value, index) => (
             <option
               key={ value.value }
               value={ value.value }
diff --git a/src/entities/payment/ui/info-wrap.tsx b/src/entities/payment/ui/info-wrap.tsx
index ab57c3c..88196ee 100644
--- a/src/entities/payment/ui/info-wrap.tsx
+++ b/src/entities/payment/ui/info-wrap.tsx
@@ -36,7 +36,7 @@ import { useStore } from '@/shared/model/store';
 
 export const InfoWrap = () => {
   const { t } = useTranslation();
-  const midOptions = useStore.getState().UserStore.selectOptionsMidsWithoutGids;
+  const midOptions = useStore.getState().UserStore.selectOptionsMids;
   const userMid = useStore.getState().UserStore.mid;
   let midItem = midOptions.filter((value, index) => {
     return value.value === userMid;
@@ -209,7 +209,7 @@ export const InfoWrap = () => {
     callPaymentIntallmentDetail(cardCompany);
   };
   useEffect(() => {
-    if(mid){
+    if(!!mid){
       callPaymentCard();
       callPaymentNonCard();
       callPaymentIntallment();
diff --git a/src/entities/payment/ui/notification-data-wrap.tsx b/src/entities/payment/ui/notification-data-wrap.tsx
index 51c2e50..deb2ceb 100644
--- a/src/entities/payment/ui/notification-data-wrap.tsx
+++ b/src/entities/payment/ui/notification-data-wrap.tsx
@@ -9,8 +9,11 @@ export const NotificationDataWrap = () => {
   const { t } = useTranslation();
   const midOptions = useStore.getState().UserStore.selectOptionsMids;
   const userMid = useStore.getState().UserStore.mid;
+  let midItem = midOptions.filter((value, index) => {
+    return value.value === userMid;
+  });
 
-  const [mid, setMid] = useState<string>(userMid);
+  const [mid, setMid] = useState<string>((midItem.length > 0)? userMid: '');
   const [merchantInfo, setMerchantInfo] = useState<Record<string, any>>();
   const [creditCard, setCreditCard] = useState<Record<string, any>>();
   const [accountTransfer, setAccountTransfer] = useState<Record<string, any>>();
@@ -39,7 +42,9 @@ export const NotificationDataWrap = () => {
     });
   };
   useEffect(() => {
-    callPaymentNotificationData();
+    if(!!mid){
+      callPaymentNotificationData();
+    }
   }, [mid]);
   
   return (
diff --git a/src/pages/account/password/modify-cancel-password-page.tsx b/src/pages/account/password/modify-cancel-password-page.tsx
index 0218f1c..811927b 100644
--- a/src/pages/account/password/modify-cancel-password-page.tsx
+++ b/src/pages/account/password/modify-cancel-password-page.tsx
@@ -16,10 +16,13 @@ import { snackBar } from '@/shared/lib/toast';
 export const PasswordModifyCancelPasswordPage = () => {
   const { t } = useTranslation();
   const { navigate } = useNavigate();
-  const midOptions = useStore.getState().UserStore.selectOptionsMids;
+  const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids;
   const userMid = useStore.getState().UserStore.mid;
+  let midItem = midOptionsWithoutGids.filter((value, index) => {
+    return value.value === userMid;
+  });
 
-  const [mid, setMid] = useState<string>(userMid);
+  const [mid, setMid] = useState<string>((midItem.length > 0)? userMid: '');
   const [password, setPassword] = useState<string>('');
   const [confirmPassword, setConfirmPassword] = useState<string>('');
 
@@ -78,7 +81,7 @@ export const PasswordModifyCancelPasswordPage = () => {
                     onChange={(e) => setMid(e.target.value)}
                   >
                   {
-                    midOptions.map((value) => (
+                    midOptionsWithoutGids.map((value) => (
                       <option
                         key={value.value}
                         value={value.value}