浏览代码

Merge branch 'master' of http://svn.ouj.com:3000/eos_sicbo/chat

sa03 5 年之前
父节点
当前提交
f3b8dd57f3
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      protected/controllers/GroupController.php

+ 3 - 1
protected/controllers/GroupController.php

@@ -96,8 +96,10 @@ class GroupController extends BaseController {
             $sessionInfo = $objSession->objTable->getRow(['user_id' => $user_id, 'session_id' => $args['group_id']], ['_field' => 'is_pin, pin_time_int, is_mute']);
         }
 
+        $objGroupEos = new TableHelper('group_eos', 'dw_chat');
+        $eosInfo = $objGroupEos->getRow($args);
 
-        return compact('group', 'members', 'pinMsg', 'sessionInfo', 'blockList', 'adminList');
+        return compact('group', 'eosInfo', 'members', 'pinMsg', 'sessionInfo', 'blockList', 'adminList');
     }
 
     /**