星标 异常

@@ -887,18 +887,38 @@ class Home extends Base {
         $fv = (int) app()->request($d);
         $fv = (int) app()->request($d);
         $fv = $fv ? 1 : 0;
         $fv = $fv ? 1 : 0;
 
 
-        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`');
+//        if(app()->request('source')==2){
+            $ids = es('email_lists_branch_'.app()->request('postid','','intval'))
+                ->search([
+                    "_source"  => ["uuid"],
+                    'query'=>[
+                        'bool'=>[
+                            'must'=>[
+                                ['terms'=>['uuid'=>$mail_ids]],
+                                ["term"=>["source"=>2]],//ai邮箱
+                            ]
+                        ]
+                    ]
+                ],0,1000);
+            $mail_ids = [];
+            foreach ($ids['hits']['hits']??[] as $item){
+                $mail_ids[] = $item['_source']['uuid'];
             }
             }
 
 
+            $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);
         $data  = db()->all($sql);
 //        $data2  = db()->all(str_replace('from `lists` where','from `lists_hot` where',$sql));
 //        $data2  = db()->all(str_replace('from `lists` where','from `lists_hot` where',$sql));
 //        $data = array_merge($data,$data2);
 //        $data = array_merge($data,$data2);
         if($data){
         if($data){
             // 查询邮箱
             // 查询邮箱
-            $emails = array_column($emails,null,'id');
+            $emails = array_column(db()->all(emailSql::all(dbWhere(['id'=>array_column($data,'email_id')]))),null,'id');
+
+
             $uids = [];
             $uids = [];
             foreach ($data as $datum){
             foreach ($data as $datum){
                 if(empty($uids[$datum['email_id']])){
                 if(empty($uids[$datum['email_id']])){