260722_01_ENH: 버그 수정 및 개선 사항 수정

This commit is contained in:
2026-07-22 16:53:00 +09:00
parent d8b565276d
commit 2dd5b88c6f
67 changed files with 1925 additions and 736 deletions

View File

@@ -16,7 +16,6 @@ import {useAuth} from "@/hooks/useAuth";
import type { MultiSelectOption } from "@/components/common/KriAutoComplete";
import { useMounted } from "@kri/common/hooks";
import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter";
import {DEFAULT_COMPANY_NAME} from "@/const/userConst";
import {Upload} from "lucide-react";
import {
useRoleListQuery,
@@ -160,7 +159,15 @@ const UserManagePage = () => {
mounted &&
isInternalManager(auth.user?.userRole)
const userCmpn = auth.user?.userCmpn ?? DEFAULT_COMPANY_NAME;
// 로그인 계정의 소속 회사를 기본 선택하되, 회사 목록에 매치되는 게 없으면 자사(ownCmpn) 중 가장 상단 1개로 대체한다.
const userCmpn = useMemo(() => {
const currentCmpnId = auth.user?.userCmpn;
const matched = userCmpnArray.find((c) => c.cmpnId === currentCmpnId);
if (matched) return matched.cmpnId;
const fallback = userCmpnArray.find((c) => c.ownCmpn);
return fallback?.cmpnId ?? currentCmpnId ?? '';
}, [auth.user?.userCmpn, userCmpnArray]);
if (!mounted) return <LoadingOverlayAdapter force />;