|
@@ -241,6 +241,12 @@ class WechatSubscribeService extends BaseService
|
|
|
$list = $sql->paginate(getProp($param,'limit',10));
|
|
|
}
|
|
|
$list->makeHidden(array_merge(self::$hideField));
|
|
|
+ foreach ($list as $val){
|
|
|
+ $val->wechat_accounts = WechatAccountSubscribeDetail::query()->where(
|
|
|
+ ['subscribe_id' => $val->id,
|
|
|
+ 'status' => 1
|
|
|
+ ])->select('wechat_authorization_info_id as id',"appid",'nick_name')->get();
|
|
|
+ }
|
|
|
return $list;
|
|
|
}
|
|
|
|
|
@@ -260,7 +266,11 @@ class WechatSubscribeService extends BaseService
|
|
|
$sql->where('miniprogram_id', $param['miniprogram_id']);
|
|
|
}
|
|
|
if(getProp($param,'wechat_authorization_info_id')){
|
|
|
- $sql->whereJsonContains('wechat_accounts->id',$param['wechat_authorization_info_id']);
|
|
|
+ $ids = WechatAccountSubscribeDetail::query()->where([
|
|
|
+ 'wechat_authorization_info_id' => $param['wechat_authorization_info_id'],
|
|
|
+ 'status' => 1,
|
|
|
+ ])->pluck('weacht_keyworld_id')->toArray();
|
|
|
+ $sql->whereIn('id',$ids);
|
|
|
}
|
|
|
return $sql;
|
|
|
}
|