diff --git a/src/app/api/survey-sales/service.ts b/src/app/api/survey-sales/service.ts index 83c2716..b9bfbd8 100644 --- a/src/app/api/survey-sales/service.ts +++ b/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: [ - { 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 } }], - }, + { 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 } }] }, ] break case 'Builder': diff --git a/src/components/inquiry/Detail.tsx b/src/components/inquiry/Detail.tsx index eaac1fe..d1894bd 100644 --- a/src/components/inquiry/Detail.tsx +++ b/src/components/inquiry/Detail.tsx @@ -44,7 +44,7 @@ export default function Detail() { 販売店 - {isBuilderOrPartner ? '-' : inquiryDetail?.storeNm} + {isBuilderOrPartner ? '-' : inquiryDetail?.storeNm ?? ' - '} E-mail diff --git a/src/components/popup/SurveySaleSubmitPopup.tsx b/src/components/popup/SurveySaleSubmitPopup.tsx index 5146d75..2093c38 100644 --- a/src/components/popup/SurveySaleSubmitPopup.tsx +++ b/src/components/popup/SurveySaleSubmitPopup.tsx @@ -171,7 +171,7 @@ export default function SurveySaleSubmitPopup() {

-販売店名: - ${surveyDetail?.store} (${surveyDetail?.storeId}) + ${surveyDetail?.store} (${surveyDetail?.storeId ?? ' - '})

diff --git a/src/components/survey-sale/list/SearchForm.tsx b/src/components/survey-sale/list/SearchForm.tsx index 6a42ae1..d04e40f 100644 --- a/src/components/survey-sale/list/SearchForm.tsx +++ b/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 (

-
diff --git a/src/components/ui/common/Header.tsx b/src/components/ui/common/Header.tsx index dc741de..8f0301d 100644 --- a/src/components/ui/common/Header.tsx +++ b/src/components/ui/common/Header.tsx @@ -114,13 +114,13 @@ export default function Header() {