diff --git a/fems-api/src/services/auth.service.js b/fems-api/src/services/auth.service.js index abc1393..168235e 100644 --- a/fems-api/src/services/auth.service.js +++ b/fems-api/src/services/auth.service.js @@ -65,10 +65,14 @@ class AuthService { // 사용자 정보에서 Roles 배열을 제거하고 가공된 권한 정보를 추가 const userData = user.toJSON(); + const companyData = userData.Company || {}; delete userData.Roles; const userInfo = { ...userData, + companyName: companyData.name, + businessNumber: companyData.businessNumber, + contractEndDate: companyData.contractEndDate, permissions, }; diff --git a/fems-api/src/utils/createInitialAdmin.js b/fems-api/src/utils/createInitialAdmin.js index 4fa40e6..eaa3150 100644 --- a/fems-api/src/utils/createInitialAdmin.js +++ b/fems-api/src/utils/createInitialAdmin.js @@ -11,8 +11,8 @@ const { logCreatedAccounts } = require("./initialSetup/loggingSetup"); // 상수로 정의하여 일관성 유지 const ADMIN_COMPANY = { - BUSINESS_NUMBER: 4397802852, // 올바른 번호로 수정 - NAME: "FEMS 관리자", + BUSINESS_NUMBER: 4398702852, // 올바른 번호로 수정 + NAME: "(주)웨이스", ADDRESS: "서울시 강남구", TEL: "02-0000-0000", EMAIL: "admin@fems.com", diff --git a/fems-app/src/components/layout/SideNav.tsx b/fems-app/src/components/layout/SideNav.tsx index 8c025c1..d97b913 100644 --- a/fems-app/src/components/layout/SideNav.tsx +++ b/fems-app/src/components/layout/SideNav.tsx @@ -27,7 +27,6 @@ import { Target, Brain, Sliders, - Building2, Users, HelpCircle, MessageSquare, @@ -35,6 +34,8 @@ import { ChevronDown, ChevronRight, Puzzle, + Building2, + Calendar, } from "lucide-react"; import { useState } from "react"; @@ -288,8 +289,24 @@ export function SideNav() { })); }; + // 날짜 포맷팅 함수 + const formatDate = (dateString: string) => { + return new Date(dateString).toLocaleDateString("ko-KR", { + year: "numeric", + month: "long", + day: "numeric", + }); + }; + + // 사업자번호 포맷팅 함수 + const formatBusinessNumber = (number: string) => { + if (!number) return ""; + const cleaned = number.replace(/[^0-9]/g, ""); + return `${cleaned.slice(0, 3)}-${cleaned.slice(3, 5)}-${cleaned.slice(5)}`; + }; + return ( -