From 0977dfe8b01a821d8b326bdd0d163de4cb4c52ce Mon Sep 17 00:00:00 2001
From: wuhaotian <442384644@qq.com>
Date: Thu, 19 Jun 2025 15:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E7=BB=84=E5=90=88=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/system/config/SystemGroupDataDao.php           | 4 +++-
 crmeb/app/services/diy/DiyServices.php                       | 4 ++--
 crmeb/app/services/system/config/SystemGroupDataServices.php | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/dao/system/config/SystemGroupDataDao.php b/crmeb/app/dao/system/config/SystemGroupDataDao.php
index 48be28e22..fbef78146 100644
--- a/crmeb/app/dao/system/config/SystemGroupDataDao.php
+++ b/crmeb/app/dao/system/config/SystemGroupDataDao.php
@@ -41,7 +41,9 @@ class SystemGroupDataDao extends BaseDao
      */
     public function getGroupDataList(array $where, int $page, int $limit)
     {
-        return $this->search($where)->page($page, $limit)->order('sort desc,id DESC')->select()->toArray();
+        return $this->search($where)->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->order('sort desc,id DESC')->select()->toArray();
     }
 
     /**
diff --git a/crmeb/app/services/diy/DiyServices.php b/crmeb/app/services/diy/DiyServices.php
index 982506cb4..fe53a60ee 100644
--- a/crmeb/app/services/diy/DiyServices.php
+++ b/crmeb/app/services/diy/DiyServices.php
@@ -334,9 +334,9 @@ class DiyServices extends BaseServices
         $systemGroupServices = app()->make(SystemGroupServices::class);
         $menus_gid = $systemGroupServices->value(['config_name' => 'routine_my_menus'], 'id');
         $banner_gid = $systemGroupServices->value(['config_name' => 'routine_my_banner'], 'id');
-        $routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid]);
+        $routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid], 'all');
         $routine_my_menus = $routine_my_menus['list'] ?? [];
-        $routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid]);
+        $routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid], 'all');
         $routine_my_banner = $routine_my_banner['list'] ?? [];
         $my_banner_status = boolval($info['my_banner_status']);
         return compact('status', 'order_status', 'routine_my_menus', 'routine_my_banner', 'color_change', 'my_banner_status');
diff --git a/crmeb/app/services/system/config/SystemGroupDataServices.php b/crmeb/app/services/system/config/SystemGroupDataServices.php
index bd652bce7..0de51169c 100644
--- a/crmeb/app/services/system/config/SystemGroupDataServices.php
+++ b/crmeb/app/services/system/config/SystemGroupDataServices.php
@@ -74,9 +74,10 @@ class SystemGroupDataServices extends BaseServices
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getGroupDataList(array $where)
+    public function getGroupDataList(array $where, $type = 'limit')
     {
         [$page, $limit] = $this->getPageValue();
+        if ($type == 'all') $page = $limit = 0;
         $list = $this->dao->getGroupDataList($where, $page, $limit);
         $count = $this->dao->count($where);
         $type = '';