| 
@@ -147,6 +147,7 @@ class Home extends Base { | 
 | 
@@ -147,6 +147,7 @@ class Home extends Base { | 
| 
147
 | 
             $where['answered'] = app()->request('answered',0,'bool_Val')?1:0;
 | 
147
 | 
             $where['answered'] = app()->request('answered',0,'bool_Val')?1:0;
 | 
| 
148
 | 
         }
 | 
148
 | 
         }
 | 
| 
149
 | 
 
 | 
149
 | 
 
 | 
| 
 | 
   | 
150
 | 
+        // 这个主要是来筛选 是否是自己发送的
 | 
| 
150
 | 
         $fromto = app()->request('formorto');
 | 
151
 | 
         $fromto = app()->request('formorto');
 | 
| 
151
 | 
         if($fromto=='from'){
 | 
152
 | 
         if($fromto=='from'){
 | 
| 
152
 | 
             $where['from'] = $this->getEmails('email');
 | 
153
 | 
             $where['from'] = $this->getEmails('email');
 | 
 | 
@@ -154,6 +155,24 @@ class Home extends Base { | 
 | 
@@ -154,6 +155,24 @@ class Home extends Base { | 
| 
154
 | 
             $where['from.notin'] = $this->getEmails('email');
 | 
155
 | 
             $where['from.notin'] = $this->getEmails('email');
 | 
| 
155
 | 
         }
 | 
156
 | 
         }
 | 
| 
156
 | 
 
 | 
157
 | 
 
 | 
| 
 | 
   | 
158
 | 
+        /**
 | 
| 
 | 
   | 
159
 | 
+         * 不查询哪些发件人的邮件
 | 
| 
 | 
   | 
160
 | 
+         */
 | 
| 
 | 
   | 
161
 | 
+        $form_not_in = app()->request('form_not_in');
 | 
| 
 | 
   | 
162
 | 
+        if($form_not_in){
 | 
| 
 | 
   | 
163
 | 
+            $form_not_in = is_array($form_not_in) ? $form_not_in : [$form_not_in];
 | 
| 
 | 
   | 
164
 | 
+            $form_not_in = array_filter($form_not_in,function ($v){
 | 
| 
 | 
   | 
165
 | 
+               if(is_string($v) && Verify::sEmail($v)){
 | 
| 
 | 
   | 
166
 | 
+                   return true;
 | 
| 
 | 
   | 
167
 | 
+               }
 | 
| 
 | 
   | 
168
 | 
+               return false;
 | 
| 
 | 
   | 
169
 | 
+            });
 | 
| 
 | 
   | 
170
 | 
+            if($form_not_in){
 | 
| 
 | 
   | 
171
 | 
+                $where['from.notin'] = $form_not_in;
 | 
| 
 | 
   | 
172
 | 
+            }
 | 
| 
 | 
   | 
173
 | 
+        }
 | 
| 
 | 
   | 
174
 | 
+
 | 
| 
 | 
   | 
175
 | 
+
 | 
| 
157
 | 
         $lists = db()->all(
 | 
176
 | 
         $lists = db()->all(
 | 
| 
158
 | 
             listsSql::lists(
 | 
177
 | 
             listsSql::lists(
 | 
| 
159
 | 
                 dbWhere($where),
 | 
178
 | 
                 dbWhere($where),
 |