diff --git a/common/templatetags/tags.py b/common/templatetags/tags.py
index cab3686..d19d415 100644
--- a/common/templatetags/tags.py
+++ b/common/templatetags/tags.py
@@ -10,6 +10,6 @@ def getattr_filter(obj, attr):
     return getattr(obj, attr, '')
 
 
-@register.simple_tag
-def get_query_param(request, param_name):
-    return request.GET.get(param_name, '')
+@register.filter
+def get_value(dictionary, key):
+    return dictionary.get(key)
diff --git a/templates/filter.html b/templates/filter.html
index 5ee6117..3eef1e2 100644
--- a/templates/filter.html
+++ b/templates/filter.html
@@ -1,3 +1,5 @@
+{% load tags %}
+
 <form action="{% url form_action_url %}" method="get">
     {% csrf_token %}
     <div class="row">
@@ -5,21 +7,22 @@
             {% if filter.type == 'text' %}
             <div class="col">
                 <label for="{{ filter.id }}" class="form-label">{{ filter.label }}</label>
-                <input type="text" class="form-control" id="{{ filter.id }}" name="{{ filter.name }}" placeholder="{{ filter.placeholder }}">
+                <input type="text" class="form-control" id="{{ filter.id }}" name="{{ filter.name }}" placeholder="{{ filter.placeholder }}" value="{{ request.GET|get_value:filter.name }}">
             </div>
             {% elif filter.type == 'select' %}
             <div class="col">
                 <label class="form-label" for="{{ filter.id }}">{{ filter.label }}</label>
                 <select class="form-control" id="{{ filter.id }}" name="{{ filter.name }}">
+                    <option value="">请选择</option>
                     {% for option in filter.options %}
-                    <option value="{{ option.value }}">{{ option.display }}</option>
+                    <option value="{{ option.value }}" {% if request.GET|get_value:filter.name == option.value %}selected{% endif %}>{{ option.display }}</option>
                     {% endfor %}
                 </select>
             </div>
             {% elif filter.type == 'date' %}
             <div class="col">
                 <label for="{{ filter.id }}" class="form-label">{{ filter.label }}</label>
-                <input type="date" class="form-control" id="{{ filter.id }}" name="{{ filter.name }}">
+                <input type="date" class="form-control" id="{{ filter.id }}" name="{{ filter.name }}" value="{{ request.GET|get_value:filter.name }}">
             </div>
             {% endif %}
         {% endfor %}
@@ -27,4 +30,4 @@
             <button type="submit" class="btn btn-primary">查询</button>
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>