x

@@ -121,13 +121,21 @@ class Home extends Base {
                 $where['_'][] = '(`from` = "'.$address.'" or `to_name` like "%'.$address.'%")';
                 $where['_'][] = '(`from` = "'.$address.'" or `to_name` like "%'.$address.'%")';
             }
             }
         }
         }
-        // from
+        // from 搜索收件人
         if(app()->requestHas('from')){
         if(app()->requestHas('from')){
-            $where['from'] = app()->request('from');
-            if(!$where['from']){
+            // 如果是发件箱
+            if($folder == '发件箱'){
+                $where['to'] = app()->request('from');
+            }else{
+                $where['from'] = app()->request('from');
+            }
+
+            if(!$where['from'] || !$where['to']){
                 // 不让查询数据
                 // 不让查询数据
                 $where['id'] = 0;
                 $where['id'] = 0;
             }
             }
+
+
         }
         }