diff --git a/tlias-web-management/src/main/java/com/inmind/controller/EmpController.java b/tlias-web-management/src/main/java/com/inmind/controller/EmpController.java
index 3def20d..695c1f1 100644
--- a/tlias-web-management/src/main/java/com/inmind/controller/EmpController.java
+++ b/tlias-web-management/src/main/java/com/inmind/controller/EmpController.java
@@ -5,11 +5,14 @@ import com.inmind.pojo.Result;
 import com.inmind.service.EmpService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDate;
+
 @RequestMapping("/emps")
 @RestController
 @Slf4j
@@ -20,19 +23,17 @@ public class EmpController {
 
     @GetMapping
     public Result page(
-             @RequestParam(defaultValue = "1") Integer page
-            ,@RequestParam(defaultValue = "10") Integer pageSize){
-        /*if (page == null) {
-            page = 1;
-        }
-
-        if (pageSize == null) {
-            pageSize = 10;
-        }*/
-
+            @RequestParam(defaultValue = "1") Integer page
+             ,@RequestParam(defaultValue = "10") Integer pageSize
+             , String name
+             , Short gender
+             ,@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate begin
+             ,@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate end
+            )
+    {
         log.info("分页查询：{}，{}",page,pageSize);
         //调用员工业务层的分页查询功能
-        PageBean pageBean =  empService.page(page,pageSize);
+        PageBean pageBean =  empService.page(page,pageSize,name,gender,begin,end);
         return Result.success(pageBean);
     }
 }
diff --git a/tlias-web-management/src/main/java/com/inmind/mapper/EmpMapper.java b/tlias-web-management/src/main/java/com/inmind/mapper/EmpMapper.java
index 3808de3..c073855 100644
--- a/tlias-web-management/src/main/java/com/inmind/mapper/EmpMapper.java
+++ b/tlias-web-management/src/main/java/com/inmind/mapper/EmpMapper.java
@@ -4,6 +4,7 @@ import com.inmind.pojo.Emp;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Mapper
@@ -17,13 +18,18 @@ public interface EmpMapper {
 
     /**
      * 分页查询
+     *
      * @param
      * @param
+     * @param name
+     * @param gender
+     * @param begin
+     * @param end
      * @return
      */
     /*@Select("select * from emp limit #{startIndex},#{pageSize}")
     List<Emp> getPageList(int startIndex,int pageSize);*/
 
-    @Select("select * from emp")
-    public List<Emp> list();
+//    @Select("select * from emp")
+    public List<Emp> list(String name, Short gender, LocalDate begin, LocalDate end);
 }
diff --git a/tlias-web-management/src/main/java/com/inmind/service/EmpService.java b/tlias-web-management/src/main/java/com/inmind/service/EmpService.java
index 5eb1a0b..d287125 100644
--- a/tlias-web-management/src/main/java/com/inmind/service/EmpService.java
+++ b/tlias-web-management/src/main/java/com/inmind/service/EmpService.java
@@ -2,12 +2,19 @@ package com.inmind.service;
 
 import com.inmind.pojo.PageBean;
 
+import java.time.LocalDate;
+
 public interface EmpService {
     /**
      * 分页查询
+     *
      * @param page
      * @param pageSize
+     * @param name
+     * @param gender
+     * @param begin
+     * @param end
      * @return
      */
-    PageBean page(Integer page, Integer pageSize);
+    PageBean page(Integer page, Integer pageSize, String name, Short gender, LocalDate begin, LocalDate end);
 }
diff --git a/tlias-web-management/src/main/java/com/inmind/service/impl/EmpServiceImpl.java b/tlias-web-management/src/main/java/com/inmind/service/impl/EmpServiceImpl.java
index 9a0e022..d14359c 100644
--- a/tlias-web-management/src/main/java/com/inmind/service/impl/EmpServiceImpl.java
+++ b/tlias-web-management/src/main/java/com/inmind/service/impl/EmpServiceImpl.java
@@ -9,6 +9,7 @@ import com.inmind.service.EmpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Service
@@ -46,16 +47,21 @@ public class EmpServiceImpl implements EmpService {
 
     /**
      * 分页查询
-     * @param page 页码
+     *
+     * @param page     页码
      * @param pageSize 每页显示条数
+     * @param name
+     * @param gender
+     * @param begin
+     * @param end
      * @return
      */
     @Override
-    public PageBean page(Integer page, Integer pageSize) {
+    public PageBean page(Integer page, Integer pageSize, String name, Short gender, LocalDate begin, LocalDate end) {
         //使用分页插件，开始分页，传入页码和每页显示条数即可
         PageHelper.startPage(page,pageSize);
         //调用mapper的普通的查询语句即可(此时list方法已经被分页插件修改了底层sql，它返回一个包含分页查询数据的page对象)
-        List<Emp> list = empMapper.list();
+        List<Emp> list = empMapper.list(name, gender, begin, end);
 
         Page<Emp> p = (Page<Emp>) list;
         //封装分页查询结果
diff --git a/tlias-web-management/src/main/resources/com/inmind/mapper/EmpMapper.xml b/tlias-web-management/src/main/resources/com/inmind/mapper/EmpMapper.xml
new file mode 100644
index 0000000..ab3aa0d
--- /dev/null
+++ b/tlias-web-management/src/main/resources/com/inmind/mapper/EmpMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inmind.mapper.EmpMapper">
+
+    <select id="list" resultType="com.inmind.pojo.Emp"><!--注意：resultType定义的是单条记录的java封装类型-->
+        select * from emp
+        <where>
+            <if test="name != null">
+                name like  concat('%',#{name},'%')
+            </if>
+            <if test="gender != null">
+                and gender  = #{gender}
+            </if>
+            <if test="begin != null and end != null">
+                and entrydate between #{begin} and #{end}
+            </if>
+        </where>
+            order by update_time desc
+    </select>
+
+</mapper>
\ No newline at end of file