From fcb24042de8d23ae3fdb6c9041c99f6c314417ca Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Wed, 2 Jul 2025 14:35:20 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=EC=A1=B0=EC=82=AC=EB=A7=A4?= =?UTF-8?q?=EB=AC=BC=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/api/survey-sales/service.ts | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) 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': From 2fb4591ea0bc078d33b850597ee961c774af7b5f Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Wed, 2 Jul 2025 14:36:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EB=B9=88=20=EA=B0=92=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=ED=95=98?= =?UTF-8?q?=EC=9D=B4=ED=94=88(-)=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/inquiry/Detail.tsx | 2 +- src/components/popup/SurveySaleSubmitPopup.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ?? ' - '})

From b2887dcd147f47f6b02f352ff60b86c9ee207a5a Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Wed, 2 Jul 2025 14:36:22 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B0=94?= =?UTF-8?q?=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20=EA=B2=BD=EB=A1=9C=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 --- src/components/survey-sale/list/SearchForm.tsx | 10 ++++++++-- src/components/ui/common/Header.tsx | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) 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() {