src/app/api/survey-sales/service.ts

@@ -123,20 +123,9 @@ export class SurveySalesService {
         break
       case 'Admin_Sub':
         where.OR = [
-          {
+          { AND: [{ STORE_ID: { equals: this.session?.storeId } }] },
-            AND: [{ STORE_ID: { equals: this.session?.storeId } }],
+          { AND: [{ SUBMISSION_TARGET_ID: { equals: this.session?.storeId } }, { SUBMISSION_STATUS: { equals: true } }] },
-          },
+          { AND: [{ SUBMISSION_TARGET_NM: { equals: this.session?.storeNm } }, { SUBMISSION_STATUS: { equals: true } }] },
-          {
-            AND: [
-              { SUBMISSION_TARGET_ID: { equals: this.session?.storeId } },
-              { CONSTRUCTION_POINT_ID: { not: null } },
-              { CONSTRUCTION_POINT_ID: { not: '' } },
-              { SUBMISSION_STATUS: { equals: true } },
-            ],
-          },
-          {
-            AND: [{ SUBMISSION_TARGET_NM: { equals: this.session?.storeNm } }, { SUBMISSION_STATUS: { equals: true } }],
-          },
         ]
         break
       case 'Builder':

src/components/inquiry/Detail.tsx

@@ -44,7 +44,7 @@ export default function Detail() {
                 </tr>
                 <tr>
                   <th>販売店</th>
-                  <td>{isBuilderOrPartner ? '-' : inquiryDetail?.storeNm}</td>
+                  <td>{isBuilderOrPartner ? '-' : inquiryDetail?.storeNm ?? ' - '}</td>
                 </tr>
                 <tr>
                   <th>E-mail</th>

src/components/popup/SurveySaleSubmitPopup.tsx

@@ -171,7 +171,7 @@ export default function SurveySaleSubmitPopup() {
     <p style="font-size: 13px; font-weight: 400; color: #2e3a59; margin-bottom: 3px;">
       -販売店名：
       <span style="color: #417DDC;">
-        ${surveyDetail?.store} (${surveyDetail?.storeId})
+        ${surveyDetail?.store} (${surveyDetail?.storeId ?? ' - '})
       </span>
     </p>
     <p style="font-size: 13px; font-weight: 400; color: #2e3a59; margin-bottom: 15px;">

src/components/survey-sale/list/SearchForm.tsx

@@ -8,7 +8,7 @@ import { useAlertMsg, WARNING_MESSAGE } from '@/hooks/useAlertMsg'
 export default function SearchForm({ memberRole, userId }: { memberRole: string; userId: string }) {
   const router = useRouter()
   const { showErrorAlert } = useAlertMsg()
-  const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort, setOffset } = useSurveyFilterStore()
+  const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort, setOffset, reset } = useSurveyFilterStore()
   const [searchKeyword, setSearchKeyword] = useState(keyword)
   const [option, setOption] = useState(searchOption)
   const searchParams = useSearchParams()
@@ -34,7 +34,13 @@ export default function SearchForm({ memberRole, userId }: { memberRole: string;
   return (
     <div className="sale-frame">
       <div className="sale-form-bx">
-        <button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale/regist')}>
+        <button
+          className="btn-frame n-blue icon"
+          onClick={() => {
+            reset()
+            router.push('/survey-sale/regist')
+          }}
+        >
           新規売買登録<i className="btn-arr"></i>
         </button>
       </div>

src/components/ui/common/Header.tsx

@@ -114,13 +114,13 @@ export default function Header() {
               <nav className="side-nav-wrap">
                 <ul className="side-nav-list">
                   <li className="side-nav-item">
-                    <button onClick={() => router.push('/survey-sale')}>調査物件一覧</button>
+                    <button onClick={() => {router.push('/survey-sale?isMySurvey=false')}}>調査物件一覧</button>
                   </li>
                   <li className="side-nav-item">
                     <button onClick={() => router.push('/survey-sale/regist')}>調査物件登録</button>
                   </li>
                   <li className="side-nav-item">
-                    <button onClick={() => router.push('/inquiry/list')}>1:1お問い合わせ</button>
+                    <button onClick={() => router.push('/inquiry/list?isMyInquiry=false')}>1:1お問い合わせ</button>
                   </li>
                   <li className="side-nav-item">
                     <button onClick={() => router.push('/inquiry/regist')}>1:1お問い合わせ登録</button>