From 53eab6ac9c6f1b5ec8a3d5ed4927040dc5ff9dc5 Mon Sep 17 00:00:00 2001
From: dohyeons <ddhhss0603@gmail.com>
Date: Mon, 1 Dec 2025 10:30:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D/=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9D=84=20company=5Fcode=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controllers/DashboardController.ts    |  2 +-
 backend-node/src/services/DashboardService.ts | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend-node/src/controllers/DashboardController.ts b/backend-node/src/controllers/DashboardController.ts
index 01ac16c0..76b666f0 100644
--- a/backend-node/src/controllers/DashboardController.ts
+++ b/backend-node/src/controllers/DashboardController.ts
@@ -419,7 +419,7 @@ export class DashboardController {
         limit: Math.min(parseInt(req.query.limit as string) || 20, 100),
         search: req.query.search as string,
         category: req.query.category as string,
-        createdBy: userId, // 본인이 만든 대시보드만
+        // createdBy 제거 - 회사 대시보드 전체 표시
       };
 
       const result = await DashboardService.getDashboards(
diff --git a/backend-node/src/services/DashboardService.ts b/backend-node/src/services/DashboardService.ts
index 4b13d6b8..5f3cea61 100644
--- a/backend-node/src/services/DashboardService.ts
+++ b/backend-node/src/services/DashboardService.ts
@@ -178,21 +178,24 @@ export class DashboardService {
       let params: any[] = [];
       let paramIndex = 1;
 
-      // 회사 코드 필터링 (최우선)
+      // 회사 코드 필터링 - company_code가 일치하면 해당 회사 사용자는 모두 조회 가능
       if (companyCode) {
-        whereConditions.push(`d.company_code = $${paramIndex}`);
-        params.push(companyCode);
-        paramIndex++;
-      }
-
-      // 권한 필터링
-      if (userId) {
+        if (companyCode === '*') {
+          // 최고 관리자는 모든 대시보드 조회 가능
+        } else {
+          whereConditions.push(`d.company_code = $${paramIndex}`);
+          params.push(companyCode);
+          paramIndex++;
+        }
+      } else if (userId) {
+        // 회사 코드 없이 userId만 있는 경우 (본인 생성 또는 공개)
         whereConditions.push(
           `(d.created_by = $${paramIndex} OR d.is_public = true)`
         );
         params.push(userId);
         paramIndex++;
       } else {
+        // 비로그인 사용자는 공개 대시보드만
         whereConditions.push("d.is_public = true");
       }