From d51539a452912283014aa52a8de79472a5af39b9 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 29 Dec 2023 18:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/groupData/GroupDataDao.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/dao/system/groupData/GroupDataDao.php b/app/common/dao/system/groupData/GroupDataDao.php
index b25635c..cd2cc5e 100644
--- a/app/common/dao/system/groupData/GroupDataDao.php
+++ b/app/common/dao/system/groupData/GroupDataDao.php
@@ -68,7 +68,10 @@ class GroupDataDao extends BaseDao
         if (!is_null($page)) $query->page($page, $limit);
         $groupData = [];
         foreach ($query->column('value,mer_id', 'group_data_id') as $k => $v) {
-            $groupData[] = json_decode($v['value'], true) + ['group_data_id' => $k, 'group_mer_id' => $v['mer_id']];
+            if(is_array(json_decode($v['value'], true))) {
+                $vValue = json_decode($v['value'], true);
+                $groupData[] = $vValue + ['group_data_id' => $k, 'group_mer_id' => $v['mer_id']];
+            }
         }
         return $groupData;
     }