From d238b47aa8c2a93c41ddbafd8934c9681935d0cd Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 4 Dec 2025 18:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/UserDashboardRuleLogic.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/logic/UserDashboardRuleLogic.php b/app/common/logic/UserDashboardRuleLogic.php
index 2a74634..de8217b 100644
--- a/app/common/logic/UserDashboardRuleLogic.php
+++ b/app/common/logic/UserDashboardRuleLogic.php
@@ -22,6 +22,7 @@ class UserDashboardRuleLogic
         $user = User::with('reportToInfo')->find($userId);;
         //获取用户所在分组
         $ugm = UserGroupMembers::where('user_id', $userId)->where('status', 1)->get();
+        $group_id = $ugm->group_id?$ugm->group_id:0;
 
         $roleRule = UserDashboardRule::orWhere(function ($query) use ($user) {
                 $query->whereIn('related', $user->roles->pluck('id'))
@@ -31,8 +32,8 @@ class UserDashboardRuleLogic
                 $query->where('related', $userId)
                     ->where('rule_type', 'user');
             })
-            ->orWhere(function ($query) use ($ugm) {
-                $query->where('related', $ugm->group_id)
+            ->orWhere(function ($query) use ($group_id) {
+                $query->where('related', $group_id)
                     ->where('rule_type', 'group');
             })
             ->orderBy('weight','desc')