diff --git a/app/chat/controller/GroupController.php b/app/chat/controller/GroupController.php
index affc932..be8ca0b 100644
--- a/app/chat/controller/GroupController.php
+++ b/app/chat/controller/GroupController.php
@@ -24,7 +24,7 @@ class GroupController extends ApiController
         if (empty($shop_id)) {
             return $this->error('参数不存在');
         }
-        return $this->success(Db::name('chat_group')->where(['shop_id' => $shop_id])->find());
+        return $this->success(Db::name('chat_group')->where(['shop_id' => $shop_id, 'owner_id' => $this->uid])->find());
     }
 
 
diff --git a/extend/chat/model/Base.php b/extend/chat/model/Base.php
index efed84d..61f443b 100644
--- a/extend/chat/model/Base.php
+++ b/extend/chat/model/Base.php
@@ -214,10 +214,10 @@ namespace extend\chat\model;
              'group_id' => $group_id,
              'chat_type' => $message['chat_type'],
              'msg_type' => $message['msg_type'],
-             'content' => $message['content'],
-             'image_url' => $message['image_url'],
-             'order_id' => $message['order_id'],
-             'coupon' => $message['coupon']?:'',
+             'content' => !empty($message['content'])?$message['content']:null,
+             'image_url' => !empty($message['image_url'])?$message['image_url']:null,
+             'order_id' => !empty($message['order_id'])?$message['order_id']:null,
+             'coupon' => !empty($message['coupon'])?$message['coupon']:null,
              'send_time' => $time,
              'session_id' => $session_id,
          ];