diff --git a/src/app/api/auth/route.ts b/src/app/api/auth/route.ts index 9d1c071..9b55c91 100644 --- a/src/app/api/auth/route.ts +++ b/src/app/api/auth/route.ts @@ -136,7 +136,8 @@ export async function POST(request: Request) { } else { finalResult = { code: 400, - message: 'Login is Failed!!', + /** 로그인에 실패했습니다. 아이디와 비밀번호를 확인해 주세요. */ + message: 'ログインに失敗しました。 IDとパスワードをご確認ください。', result: {}, } } diff --git a/src/app/api/partner/route.ts b/src/app/api/partner/route.ts index a71ed67..30fdbda 100644 --- a/src/app/api/partner/route.ts +++ b/src/app/api/partner/route.ts @@ -51,50 +51,52 @@ export async function POST(request: Request) { AND u.password = ? ` - // const sql = 'SELECT * FROM M_USER' const data = (await executeQuery(sql, [loginId, pwd])) as any[] console.log('🚀 ~ POST ~ data:', data) - if (data.length > 0) { - console.log('start session edit!') - session.langCd = null - session.currPage = null - session.rowCount = null - session.startRow = null - session.endRow = null - session.compCd = null - session.agencyStoreId = null - session.storeId = null - session.storeNm = null - session.userId = data[0].user_login_id - session.category = data[0].supplier_name - session.userNm = `${data[0].user_sei} ${data[0].user_mei}` - session.userNmKana = `${data[0].user_sei_kana} ${data[0].user_mei_kana}` - session.telNo = data[0].tel - session.fax = data[0].fax - session.email = data[0].user_login_id - session.lastEditUser = null - session.storeGubun = null - session.pwCurr = null - session.pwdInitYn = null - session.apprStatCd = null - session.loginFailCnt = null - session.loginFailMinYn = null - session.priceViewStatCd = null - session.groupId = null - session.storeLvl = null - session.custCd = null - session.builderId = data[0].user_seko_id - session.builderNo = data[0].user_seko_id - session.builderNm = data[0].supplier_name - session.isLoggedIn = true - session.role = 'Partner' - - console.log('end session edit!') - - await session.save() + if (data.length === 0) { + /** 로그인에 실패했습니다. 아이디와 비밀번호를 확인해 주세요.*/ + return NextResponse.json({ code: 400, message: 'ログインに失敗しました。 IDとパスワードをご確認ください。' }) } + console.log('start session edit!') + session.langCd = null + session.currPage = null + session.rowCount = null + session.startRow = null + session.endRow = null + session.compCd = null + session.agencyStoreId = null + session.storeId = null + session.storeNm = null + session.userId = data[0].user_login_id + session.category = data[0].supplier_name + session.userNm = `${data[0].user_sei} ${data[0].user_mei}` + session.userNmKana = `${data[0].user_sei_kana} ${data[0].user_mei_kana}` + session.telNo = data[0].tel + session.fax = data[0].fax + session.email = data[0].user_login_id + session.lastEditUser = null + session.storeGubun = null + session.pwCurr = null + session.pwdInitYn = null + session.apprStatCd = null + session.loginFailCnt = null + session.loginFailMinYn = null + session.priceViewStatCd = null + session.groupId = null + session.storeLvl = null + session.custCd = null + session.builderId = data[0].user_seko_id + session.builderNo = data[0].user_seko_id + session.builderNm = data[0].supplier_name + session.isLoggedIn = true + session.role = 'Partner' + + console.log('end session edit!') + + await session.save() + // qsp 유저 데이터 모양과 맞춰서 변환 const result = { LANG_CD: null, @@ -104,8 +106,8 @@ export async function POST(request: Request) { END_ROW: null, COMP_CD: null, AGENCY_STORE_ID: null, - STORE_ID: data[0].supplier_code, - STORE_NM: data[0].supplier_name, + STORE_ID: null, + STORE_NM: null, USER_ID: data[0].user_login_id, CATEGORY: data[0].supplier_name, USER_NM: `${data[0].user_sei} ${data[0].user_mei}`, diff --git a/src/components/Login.tsx b/src/components/Login.tsx index 2f04835..49b2e9b 100644 --- a/src/components/Login.tsx +++ b/src/components/Login.tsx @@ -78,7 +78,8 @@ export default function Login() { const validateLogin = () => { if (account.loginId === '' || account.pwd === '') { - alert('Please enter your ID and password.') + /** 아이디와 비밀번호를 입력해 주세요.*/ + alert('IDとパスワードをご入力ください。') return false } return true diff --git a/src/components/pdf/SurveySalePdf.tsx b/src/components/pdf/SurveySalePdf.tsx index 1dff9c4..9a9ce77 100644 --- a/src/components/pdf/SurveySalePdf.tsx +++ b/src/components/pdf/SurveySalePdf.tsx @@ -134,7 +134,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) { {/* Header */} - HWJ 現地調査シート1/2 + HWJ 現地調査シート 現地明登施工店名 diff --git a/src/components/popup/ZipCodePopup.tsx b/src/components/popup/ZipCodePopup.tsx index 5bf8f7a..93db808 100644 --- a/src/components/popup/ZipCodePopup.tsx +++ b/src/components/popup/ZipCodePopup.tsx @@ -110,7 +110,8 @@ export default function ZipCodePopup() { {addressInfo?.length === 0 && ( -
조회된 데이터가 없습니다.
+ {/* 조회된 데이터가 없습니다.*/} +
照会されたデータがありません。
)} diff --git a/src/components/survey-sale/detail/BasicForm.tsx b/src/components/survey-sale/detail/BasicForm.tsx index 64f415e..570b7bd 100644 --- a/src/components/survey-sale/detail/BasicForm.tsx +++ b/src/components/survey-sale/detail/BasicForm.tsx @@ -75,6 +75,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba
+ {/* 현지 조사일*/}
現地調査日
{['CREATE', 'EDIT'].includes(mode as 'CREATE' | 'EDIT') ? (
@@ -90,7 +91,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba />
) : ( - + )}
diff --git a/src/components/ui/Main.tsx b/src/components/ui/Main.tsx index 7f61801..2a93bc7 100644 --- a/src/components/ui/Main.tsx +++ b/src/components/ui/Main.tsx @@ -62,7 +62,7 @@ export default function Main() {
お問い合わせ登録
-
新規お問い合わせの 作成
+
新規お問い合わせの作成
diff --git a/src/components/ui/common/Header.tsx b/src/components/ui/common/Header.tsx index 6a4c1e2..f217359 100644 --- a/src/components/ui/common/Header.tsx +++ b/src/components/ui/common/Header.tsx @@ -100,7 +100,7 @@ export default function Header() { }} >
-
私は作成したお問 い合わせ
+
私は作成したお問い合わせ