diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts
index a1d818a..d3160b6 100644
--- a/src/app/api/survey-sales/route.ts
+++ b/src/app/api/survey-sales/route.ts
@@ -75,7 +75,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
where.OR = [
{
// 같은 판매점에서 작성한 제출/제출되지 않은 매물
- AND: [{ STORE: { equals: params.store } }],
+ AND: [{ STORE_ID: { equals: params.store } }],
},
{
// MUSUBI (시공권한 X) 가 ORDER 에 제출한 매물
@@ -89,7 +89,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
{
// MUSUBI (시공권한 X) 같은 판매점에서 작성한 제출/제출되지 않은 매물
AND: [
- { STORE: { equals: params.store } },
+ { STORE_ID: { equals: params.store } },
{
OR: [{ CONSTRUCTION_POINT: { equals: null } }, { CONSTRUCTION_POINT: { equals: '' } }],
},
@@ -109,9 +109,10 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
case 'Builder': // MUSUBI (시공권한 O)
case 'Partner': // PARTNER
- // 같은 시공ID에서 작성된 매물
+ // 시공점이 있고 STORE_ID가 시공ID와 같은 매물
where.AND?.push({
- CONSTRUCTION_POINT: { equals: params.builderNo },
+ CONSTRUCTION_POINT: { not: null },
+ STORE_ID: { equals: params.builderNo },
})
break
@@ -125,7 +126,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
},
},
{
- STORE: {
+ STORE_ID: {
equals: params.store,
},
},
@@ -149,11 +150,11 @@ export async function GET(request: Request) {
const params: SearchParams = {
keyword: searchParams.get('keyword'),
searchOption: searchParams.get('searchOption'),
- isMySurvey: searchParams.get('isMySurvey'),
+ isMySurvey: searchParams.get('isMySurvey'), //representativeId
sort: searchParams.get('sort'),
offset: searchParams.get('offset'),
role: searchParams.get('role'),
- store: searchParams.get('store'),
+ store: searchParams.get('store'), //storeId
builderNo: searchParams.get('builderNo'),
}
@@ -162,7 +163,7 @@ export async function GET(request: Request) {
// 내가 작성한 매물 조건 적용
if (params.isMySurvey) {
- where.AND.push({ REPRESENTATIVE: params.isMySurvey })
+ where.AND.push({ REPRESENTATIVE_ID: params.isMySurvey })
}
// 키워드 검색 조건 적용
diff --git a/src/components/survey-sale/detail/BasicForm.tsx b/src/components/survey-sale/detail/BasicForm.tsx
index b984101..52a541f 100644
--- a/src/components/survey-sale/detail/BasicForm.tsx
+++ b/src/components/survey-sale/detail/BasicForm.tsx
@@ -20,12 +20,16 @@ export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBas
setBasicInfoSelected()
}, [])
+ // 시공권한 user(Builder), Partner 계정은 조사매물 등록 할 때 STORE_ID에 시공점ID가 들어감
+ // 권한 별 목록 필터링 시 시공권한 user(Builder), Partner는 시공점ID가 같은 것들만 조회
useEffect(() => {
if (session?.isLoggedIn) {
setBasicInfo({
...basicInfo,
representative: session.userNm ?? '',
+ representativeId: session.userId ?? null,
store: session.role === 'Partner' ? null : session.storeNm ?? null,
+ storeId: session.role === 'Partner' || session.role === 'Builder' ? session.builderNo : session.storeId ?? null,
constructionPoint: session.builderNo ?? null,
})
}
diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx
index 2827cf8..340b13d 100644
--- a/src/components/survey-sale/detail/DetailForm.tsx
+++ b/src/components/survey-sale/detail/DetailForm.tsx
@@ -48,7 +48,9 @@ const roofInfoForm: SurveyDetailRequest = {
const basicInfoForm: SurveyBasicRequest = {
representative: '',
+ representativeId: null,
store: null,
+ storeId: null,
constructionPoint: null,
investigationDate: new Date().toLocaleDateString('en-CA'),
buildingName: null,
diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx
index 8ff5eaf..38e96a9 100644
--- a/src/components/survey-sale/list/ListTable.tsx
+++ b/src/components/survey-sale/list/ListTable.tsx
@@ -2,7 +2,7 @@
import LoadMoreButton from '@/components/LoadMoreButton'
import { useServey } from '@/hooks/useSurvey'
-import { useEffect, useState, useMemo, useRef } from 'react'
+import { useEffect, useState } from 'react'
import { useRouter, usePathname } from 'next/navigation'
import SearchForm from './SearchForm'
import { useSurveyFilterStore } from '@/store/surveyFilterStore'
@@ -47,7 +47,7 @@ export default function ListTable() {
return (
<>
-