作者 邓超

smtp

@@ -273,7 +273,12 @@ class MailListV2Es extends Base { @@ -273,7 +273,12 @@ class MailListV2Es extends Base {
273 $v['folder_name'] = db()->cache(86400)->value(folderSql::first($v['folder_id'],'folder')); 273 $v['folder_name'] = db()->cache(86400)->value(folderSql::first($v['folder_id'],'folder'));
274 274
275 // 暂时这样吧 275 // 暂时这样吧
276 - $v['flagged'] = db()->value(\Model\listsSql::first('id = '.$v['id'],'`flagged`')); 276 + $info = db()->first(\Model\listsSql::first('id = '.$v['id'],'`flagged`,`seen`,`deleted`'));
  277 + if($info){
  278 + $v['flagged'] = $info['flagged'];
  279 + $v['seen'] = $info['seen'];
  280 + $v['deleted'] = $info['deleted'];
  281 + }
277 282
278 // 手动触发同步es 283 // 手动触发同步es
279 redis()->rPush('sync_to_es',$v['id']); 284 redis()->rPush('sync_to_es',$v['id']);
@@ -281,6 +286,12 @@ class MailListV2Es extends Base { @@ -281,6 +286,12 @@ class MailListV2Es extends Base {
281 return $v; 286 return $v;
282 },$lists?:[]); 287 },$lists?:[]);
283 288
  289 + $lists = array_filter($lists,function ($v){
  290 + if($v['deleted']){
  291 + return false;
  292 + }
  293 + return true;
  294 + });
284 295
285 296
286 app()->_json(listsPage($lists,$total,$page,$limit)); 297 app()->_json(listsPage($lists,$total,$page,$limit));