From 3c56d316d524f8ff26fc5a7e001fd7ebeae308bc Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Thu, 23 Nov 2023 22:42:51 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=E5=8D=94=E8=B3=9B=E6=B4=BB=E5=8B=95?=
 =?UTF-8?q?=E7=B7=A8=E9=9B=86=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sponsoractivities/EditModal.tsx           | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/view/next-project/src/components/sponsoractivities/EditModal.tsx b/view/next-project/src/components/sponsoractivities/EditModal.tsx
index d94700e61..eb313ba7a 100644
--- a/view/next-project/src/components/sponsoractivities/EditModal.tsx
+++ b/view/next-project/src/components/sponsoractivities/EditModal.tsx
@@ -42,6 +42,8 @@ export default function EditModal(props: ModalProps) {
     expense: Number((props.sponsorActivity.expense / 11).toFixed(1)),
   });
 
+  const default_user = users.find((user) => user.id === formData.userID);
+
   const initStyleIds = sponsorStyleDetails
     ? sponsorStyleDetails.map((sponsorStyleDetail) => sponsorStyleDetail.sponsorStyleID)
     : [];
@@ -178,7 +180,9 @@ export default function EditModal(props: ModalProps) {
       .filter((user, index, self) => {
         return self.findIndex((u) => u.name === user.name) === index;
       });
-    if (res.length !== 0) setFormData({ ...formData, userID: res[0].id });
+    if (res.length !== 0 && default_user?.bureauID !== bureauId) {
+      setFormData({ ...formData, userID: res[0].id });
+    }
     return res;
   }, [bureauId]);
 
@@ -187,9 +191,9 @@ export default function EditModal(props: ModalProps) {
     <div className='my-6 grid grid-cols-5 items-center justify-items-center gap-3'>
       <p className='text-black-600'>企業名</p>
       <div className='col-span-4 w-full'>
-        <Select className='w-full' onChange={handler('sponsorID')}>
+        <Select className='w-full' onChange={handler('sponsorID')} value={data.sponsorID}>
           {sponsors.map((sponsor) => (
-            <option key={sponsor.id} value={sponsor.id} selected={sponsor.id === data.sponsorID}>
+            <option key={sponsor.id} value={sponsor.id}>
               {sponsor.name}
             </option>
           ))}
@@ -221,9 +225,9 @@ export default function EditModal(props: ModalProps) {
       </div>
       <p className='text-black-600'>担当者名</p>
       <div className='col-span-4 w-full'>
-        <Select className='w-full' onChange={handler('userID')}>
+        <Select className='w-full' onChange={handler('userID')} value={data.userID}>
           {filteredUsers.map((user) => (
-            <option key={user.id} value={user.id} selected={user.id === data.userID}>
+            <option key={user.id} value={user.id}>
               {user.name}
             </option>
           ))}
@@ -236,21 +240,16 @@ export default function EditModal(props: ModalProps) {
           onChange={(e) => {
             setFormData({ ...formData, isDone: e.target.value === '回収完了' ? true : false });
           }}
+          value={data.isDone ? '回収完了' : '未回収'}
         >
-          <option value='未回収' selected={data.isDone === false}>
-            未回収
-          </option>
-          <option value='回収完了' selected={data.isDone === true}>
-            回収完了
-          </option>
+          <option value='未回収'>未回収</option>
+          <option value='回収完了'>回収完了</option>
         </Select>
       </div>
       <p className='text-black-600'>オプション</p>
       <div className='col-span-4 w-full'>
         <Select value={data.feature} onChange={setFeature}>
-          <option value={'なし'} selected>
-            なし
-          </option>
+          <option value={'なし'}>なし</option>
           <option value={'ポスター'} disabled={isSelectSponsorBooth}>
             ポスター
           </option>