|
@@ -371,10 +371,11 @@ class Party extends Common
|
|
$where['party.is_online'] = 1; //在线
|
|
$where['party.is_online'] = 1; //在线
|
|
$where['party.is_close'] = 0; //未关闭
|
|
$where['party.is_close'] = 0; //未关闭
|
|
|
|
|
|
- $field = 'party.id,party.room_type,party.party_id,party.party_name,party.party_hot,party.party_logo,party.party_pass,party.party_type,party.easemob_room_id,type.name as type_name';
|
|
|
|
|
|
+ $field = 'party.id,party.user_id,party.room_type,party.party_id,party.party_name,party.party_hot,
|
|
|
|
+ party.party_logo,party.party_pass,party.party_type,party.easemob_room_id,type.name as type_name';
|
|
$list = Db::name('party')->alias('party')
|
|
$list = Db::name('party')->alias('party')
|
|
->join('party_type type','party.party_type = type.id','LEFT')
|
|
->join('party_type type','party.party_type = type.id','LEFT')
|
|
- ->field($field)->where($where)->order($orderby)->select();
|
|
|
|
|
|
+ ->field($field)->where($where)->order($orderby)->autopage()->select();
|
|
$list = list_domain_image($list,['party_logo']);
|
|
$list = list_domain_image($list,['party_logo']);
|
|
$resdata = [];
|
|
$resdata = [];
|
|
if (!empty($list)) {
|
|
if (!empty($list)) {
|
|
@@ -401,15 +402,17 @@ class Party extends Common
|
|
|
|
|
|
$resdata[] = [
|
|
$resdata[] = [
|
|
"id" => $v["id"],
|
|
"id" => $v["id"],
|
|
|
|
+ "user_id" => $v["user_id"],
|
|
"room_type" => $v['room_type'],
|
|
"room_type" => $v['room_type'],
|
|
"party_id" => $v["party_id"],
|
|
"party_id" => $v["party_id"],
|
|
"r_id" => $v["party_id"],
|
|
"r_id" => $v["party_id"],
|
|
"party_name" => $v["party_name"],
|
|
"party_name" => $v["party_name"],
|
|
- "party_pass" => $v["party_pass"] ? $v["party_pass"]:"",
|
|
|
|
"party_hot" => $v['party_hot'],
|
|
"party_hot" => $v['party_hot'],
|
|
"party_logo" => $v["party_logo"],
|
|
"party_logo" => $v["party_logo"],
|
|
|
|
+ "party_pass" => $v["party_pass"] ? $v["party_pass"]:"",
|
|
"party_type" => $v['type_name'],
|
|
"party_type" => $v['type_name'],
|
|
"party_type_color" => $mod == 0?5:$mod,
|
|
"party_type_color" => $mod == 0?5:$mod,
|
|
|
|
+ "easemob_room_id" => $v['easemob_room_id'],
|
|
"party_user" => $partyUserList,
|
|
"party_user" => $partyUserList,
|
|
];
|
|
];
|
|
}
|
|
}
|