修正软删除的withTrashed方法 Query类增加removeWhereField方法

library/think/db/Query.php

@@ -938,6 +938,22 @@ class Query
         }
     }
 
+    /**
+     * 去除某个查询条件
+     * @access public
+     * @param string $field     查询字段
+     * @param string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function removeWhereField($field, $logic = 'AND')
+    {
+        $logic = strtoupper($logic);
+        if (isset($this->options['where'][$logic][$field])) {
+            unset($this->options['where'][$logic][$field]);
+        }
+        return $this;
+    }
+
     /**
      * 指定查询数量
      * @access public

library/traits/model/SoftDelete.php

@@ -27,7 +27,8 @@ trait SoftDelete
     public static function withTrashed()
     {
         $model = new static();
-        return $model->db(false);
+        $field = $model->getDeleteTimeField(true);
+        return $model->db(false)->removeWhereField($field);
     }
 
     /**