内容库群选择功能 + 场景获客分页修复

Server/application/cunkebao/controller/chatroom/GetChatroomListV1Controller.php

@@ -39,10 +39,10 @@ class GetChatroomListV1Controller extends BaseController
 
             $where = [];
             if ($this->getUserInfo('isAdmin') == 1) {
-                $where[] = ['g.deleteTime', '=', 0];
+                $where[] = ['gg.isDeleted', '=', 0];
                 $where[] = ['g.ownerWechatId', 'in', $wechatIds];
             } else {
-                $where[] = ['g.deleteTime', '=', 0];
+                $where[] = ['gg.isDeleted', '=', 0];
                 $where[] = ['g.ownerWechatId', 'in', $wechatIds];
                 //$where[] = ['g.userId', '=', $this->getUserInfo('id')];
             }
@@ -55,6 +55,7 @@ class GetChatroomListV1Controller extends BaseController
                 ->field(['g.id', 'g.chatroomId', 'g.name', 'g.avatar','g.ownerWechatId', 'g.identifier', 'g.createTime',
                     'wa.nickname as ownerNickname','wa.avatar as ownerAvatar','wa.alias as ownerAlias'])
                 ->join('wechat_account wa', 'g.ownerWechatId = wa.wechatId', 'LEFT')
+                ->join(['s2_wechat_chatroom' => 'gg'], 'g.id = gg.id', 'LEFT')
                 ->where($where);
             
             $total = $data->count();