From 650c65c8882f0727f99fc2066aea0e1a3edd9069 Mon Sep 17 00:00:00 2001
From: kyy <b24053@hanmaceng.co.kr>
Date: Tue, 24 Mar 2026 13:24:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B0=98=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=20=EA=B0=80=EC=9E=85=20=EC=8B=9C=20External=20?=
 =?UTF-8?q?=ED=95=98=EB=93=9C=EC=BD=94=EB=94=A9=20=EC=A0=9C=EA=B1=B0=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=86=8C=EC=86=8D=20=ED=91=9C=EC=8B=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 userfront/lib/features/auth/presentation/signup_screen.dart   | 4 +---
 .../lib/features/dashboard/presentation/dashboard_screen.dart | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/userfront/lib/features/auth/presentation/signup_screen.dart b/userfront/lib/features/auth/presentation/signup_screen.dart
index 715c993d..0a406182 100644
--- a/userfront/lib/features/auth/presentation/signup_screen.dart
+++ b/userfront/lib/features/auth/presentation/signup_screen.dart
@@ -316,9 +316,7 @@ class _SignupScreenState extends State<SignupScreen> {
         phone: _phoneController.text.trim(),
         affiliationType: _affiliationType,
         companyCode: _affiliationType == 'AFFILIATE' ? _companyCode : null,
-        department: _deptController.text.trim().isEmpty
-            ? (_affiliationType == 'GENERAL' ? 'External' : '')
-            : _deptController.text.trim(),
+        department: _deptController.text.trim(),
         termsAccepted: true,
       );
       if (mounted) _showSuccessDialog();
diff --git a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
index fc6a9767..87e58cdb 100644
--- a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
+++ b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
@@ -687,7 +687,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           profile?.email ??
           profile?.phone ??
           tr('ui.userfront.profile.user_fallback', fallback: 'User');
-      final departmentValue = profile?.department ?? '';
+      final departmentValue = profile?.tenant?.name ?? profile?.department ?? '';
       final department = departmentValue.isNotEmpty
           ? departmentValue
           : tr('ui.userfront.profile.department_empty');