From cbef015fffea6dde7aacf90b5b61becca099f39a Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Tue, 5 Aug 2025 16:12:44 +0900 Subject: [PATCH] =?UTF-8?q?fix:=202=EC=B0=A8=EC=A0=90=20=EC=8B=9C=EA=B3=B5?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EA=B3=84=EC=A0=95=20=EC=A1=B0=EC=82=AC?= =?UTF-8?q?=EB=A7=A4=EB=AC=BC=20=EC=A1=B0=ED=9A=8C=20=EB=B0=8F=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 기존 builderId 에서 builderNo로 조건절 및 데이터 입력값 변경 --- src/app/api/survey-sales/service.ts | 8 ++++---- src/components/survey-sale/detail/ButtonForm.tsx | 8 ++++---- src/components/survey-sale/detail/DetailForm.tsx | 4 ++-- src/hooks/useSurvey.ts | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/api/survey-sales/service.ts b/src/app/api/survey-sales/service.ts index 1418730..0e18e13 100644 --- a/src/app/api/survey-sales/service.ts +++ b/src/app/api/survey-sales/service.ts @@ -128,8 +128,8 @@ export class SurveySalesService { break case 'Builder': case 'Partner': - if (this.session?.builderId) { - where.AND.push({ CONSTRUCTION_POINT_ID: { equals: this.session?.builderId } }) + if (this.session?.builderNo) { + where.AND.push({ CONSTRUCTION_POINT_ID: { equals: this.session?.builderNo } }) } else { where.AND.push({ REPRESENTATIVE_ID: { equals: this.session?.userId } }) } @@ -374,8 +374,8 @@ export class SurveySalesService { T01: () => this.checkT01Role(survey, session.userId, session.storeId), Admin: () => this.checkAdminRole(survey, session.storeId, session.storeNm), Admin_Sub: () => this.checkAdminRole(survey, session.storeId, session.storeNm), - Partner: () => this.checkPartnerOrBuilderRole(survey, session.builderId, session.userId), - Builder: () => this.checkPartnerOrBuilderRole(survey, session.builderId, session.userId), + Partner: () => this.checkPartnerOrBuilderRole(survey, session.builderNo, session.userId), + Builder: () => this.checkPartnerOrBuilderRole(survey, session.builderNo, session.userId), default: () => false, } diff --git a/src/components/survey-sale/detail/ButtonForm.tsx b/src/components/survey-sale/detail/ButtonForm.tsx index c799cc0..c5ef64e 100644 --- a/src/components/survey-sale/detail/ButtonForm.tsx +++ b/src/components/survey-sale/detail/ButtonForm.tsx @@ -85,11 +85,11 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { case 'Admin': return session.storeId === basicData.storeId case 'Admin_Sub': - return session.storeId === basicData.storeId && session.builderId === basicData.constructionPointId + return session.storeId === basicData.storeId && session.builderNo === basicData.constructionPointId case 'Builder': - return session.builderId ? session.builderId === basicData.constructionPointId : session.userId === basicData.representativeId + return session.builderNo ? session.builderNo === basicData.constructionPointId : session.userId === basicData.representativeId case 'Partner': - return session.builderId === basicData.constructionPointId + return session.builderNo === basicData.constructionPointId default: return false } @@ -151,7 +151,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { await updateSurvey({ survey: saveData, isTemporary: false, - storeId: session?.role === 'Partner' ? session?.builderId ?? null : session?.storeId ?? null, + storeId: session?.role === 'Partner' ? session?.builderNo ?? null : session?.storeId ?? null, }) if (!isUpdatingSurvey) { setMode('READ') diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx index 1241b9e..5156da7 100644 --- a/src/components/survey-sale/detail/DetailForm.tsx +++ b/src/components/survey-sale/detail/DetailForm.tsx @@ -87,7 +87,7 @@ export default function DetailForm() { store: session?.storeNm ?? null, storeId: session?.storeId ?? null, constructionPoint: session?.builderNm ?? null, - constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, + constructionPointId: session.role === 'Builder' ? (session.builderNo ? session.builderNo : '') : session.builderNo ?? null, })) const [roofInfoData, setRoofInfoData] = useState(roofInfoForm) @@ -109,7 +109,7 @@ export default function DetailForm() { store: session.storeNm ?? null, storeId: session.storeId ?? null, constructionPoint: session.builderNm ?? null, - constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, + constructionPointId: session.role === 'Builder' ? (session.builderNo ? session.builderNo : '') : session.builderNo ?? null, })) }, [session?.isLoggedIn]) diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts index 6de1d11..28193d0 100644 --- a/src/hooks/useSurvey.ts +++ b/src/hooks/useSurvey.ts @@ -280,7 +280,7 @@ export function useSurvey( mutationFn: async (survey: SurveyRegistRequest) => { const resp = await axiosInstance(null).post<{ id: number }>('/api/survey-sales', { survey: survey, - storeId: session?.role === 'Partner' ? session?.builderId ?? null : session?.storeId ?? null, + storeId: session?.role === 'Partner' ? session?.builderNo ?? null : session?.storeId ?? null, role: session?.role ?? null, }) return resp.data.id ?? 0