|
...
|
...
|
@@ -873,7 +873,12 @@ class Home extends Base { |
|
|
|
$fv = (int) app()->request($d);
|
|
|
|
$fv = $fv ? 1 : 0;
|
|
|
|
|
|
|
|
$sql = listsSql::all(dbWhere(['id'=>$mail_ids,'email_id'=>array_column($emails,'id')]),'`id`,`uid`,`email_id`,`folder_id`');
|
|
|
|
if(app()->request('source')==2){
|
|
|
|
$sql = listsSql::all(dbWhere(['id'=>$mail_ids]),'`id`,`uid`,`email_id`,`folder_id`');
|
|
|
|
}else{
|
|
|
|
$sql = listsSql::all(dbWhere(['id'=>$mail_ids,'email_id'=>array_column($emails,'id')]),'`id`,`uid`,`email_id`,`folder_id`');
|
|
|
|
}
|
|
|
|
|
|
|
|
$data = db()->all($sql);
|
|
|
|
// $data2 = db()->all(str_replace('from `lists` where','from `lists_hot` where',$sql));
|
|
|
|
// $data = array_merge($data,$data2);
|
...
|
...
|
|