diff --git a/test05/src/main/java/test05/controller/CourseController.java b/test05/src/main/java/test05/controller/CourseController.java
index b91c295..93732b6 100644
--- a/test05/src/main/java/test05/controller/CourseController.java
+++ b/test05/src/main/java/test05/controller/CourseController.java
@@ -31,7 +31,8 @@ public class CourseController {
         if (pageSize == null || pageSize < 0) {
             pageSize = 10;
         }
-        return courseService.getCourse(course, page, pageSize);
+        int offset = Math.max(0, (page - 1)) * pageSize;
+        return courseService.getCourse(course, offset, pageSize);
     }
 
     @RequestMapping("/edit")
diff --git a/test05/src/main/java/test05/controller/studentController.java b/test05/src/main/java/test05/controller/studentController.java
index 32bc781..2fe8cd2 100644
--- a/test05/src/main/java/test05/controller/studentController.java
+++ b/test05/src/main/java/test05/controller/studentController.java
@@ -24,7 +24,8 @@ public class studentController {
         if (page == null) {
             page = 1;
         }
-        return studentService.getStudent(student, page, pageSize);
+        int offset = Math.max(0, (page - 1)) * pageSize;
+        return studentService.getStudent(student, offset, pageSize);
     }
 
     @RequestMapping("/add")
diff --git a/test05/src/main/java/test05/mapper/CourseMapper.java b/test05/src/main/java/test05/mapper/CourseMapper.java
index 58c1122..bf829e0 100644
--- a/test05/src/main/java/test05/mapper/CourseMapper.java
+++ b/test05/src/main/java/test05/mapper/CourseMapper.java
@@ -12,7 +12,7 @@ public interface CourseMapper {
      * @param course 作为查询条件，该对象中的默认值表示不对该项筛选。
      * @return 查询结果集
      */
-    List<Course> selectCourse(Course course, int page, int pageSize);
+    List<Course> selectCourse(Course course, int offset, int pageSize);
 
     /**
      * 插入课程
diff --git a/test05/src/main/java/test05/mapper/StudentMapper.java b/test05/src/main/java/test05/mapper/StudentMapper.java
index df1c052..d1452c0 100644
--- a/test05/src/main/java/test05/mapper/StudentMapper.java
+++ b/test05/src/main/java/test05/mapper/StudentMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 @Mapper
 public interface StudentMapper {
-    List<Student> selectStudent(Student student, int page, int pageSize);
+    List<Student> selectStudent(Student student, int offset, int pageSize);
     int selectStudentCount(Student student);
     int insertStudent(Student student);
     int updateStudent(Student student);
diff --git a/test05/src/main/java/test05/mapper/UserMapper.java b/test05/src/main/java/test05/mapper/UserMapper.java
index b56eb2e..a302cc6 100644
--- a/test05/src/main/java/test05/mapper/UserMapper.java
+++ b/test05/src/main/java/test05/mapper/UserMapper.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 @Mapper
 public interface UserMapper {
-    List<User> selectUser(User user, int page, int pageSize);
+    List<User> selectUser(User user, int offset, int pageSize);
     User selectUserByName(String username);
     int insertUser(User user);
     int deleteUser(User user);
diff --git a/test05/src/main/java/test05/service/impl/CourseServiceImpl.java b/test05/src/main/java/test05/service/impl/CourseServiceImpl.java
index ac645b6..f58c4b9 100644
--- a/test05/src/main/java/test05/service/impl/CourseServiceImpl.java
+++ b/test05/src/main/java/test05/service/impl/CourseServiceImpl.java
@@ -78,7 +78,8 @@ public class CourseServiceImpl implements CourseService {
 
     @Override
     public Result getCourse(Course course, int page, int pageSize) {
-        List<Course> courseList = courseMapper.selectCourse(course, page, pageSize);
+        int offset = Math.max(0, (page - 1)) * pageSize;
+        List<Course> courseList = courseMapper.selectCourse(course, offset, pageSize);
         int total = courseMapper.selectCourseCount(course);
         return Result.success(courseList, total);
     }
diff --git a/test05/src/main/java/test05/service/impl/StudentServiceImpl.java b/test05/src/main/java/test05/service/impl/StudentServiceImpl.java
index 72b4bd5..d924beb 100644
--- a/test05/src/main/java/test05/service/impl/StudentServiceImpl.java
+++ b/test05/src/main/java/test05/service/impl/StudentServiceImpl.java
@@ -21,7 +21,8 @@ public class StudentServiceImpl implements StudentService {
     @Override
     public Result getStudent(Student student, int page, int pageSize) {
         try{
-            List<Student> list = studentMapper.selectStudent(student, page, pageSize);
+            int offset = Math.max(0, (page - 1)) * pageSize;
+            List<Student> list = studentMapper.selectStudent(student, offset, pageSize);
             int total = studentMapper.selectStudentCount(student);
             return Result.success(list, total);
         }catch (Exception e){
diff --git a/test05/src/main/resources/test05/mapper/CourseMapper.xml b/test05/src/main/resources/test05/mapper/CourseMapper.xml
index afe5cfc..78b2ca5 100644
--- a/test05/src/main/resources/test05/mapper/CourseMapper.xml
+++ b/test05/src/main/resources/test05/mapper/CourseMapper.xml
@@ -19,7 +19,7 @@
           AND #{course.major} in (N_MAJOR, -1)
           AND UPPER(VC_COURSE_NAME) LIKE CONCAT('%', UPPER(#{course.name}), '%')
         ORDER BY N_COURSE_ID DESC
-        LIMIT (#{page}-1)*#{pageSize},#{pageSize}
+        LIMIT #{offset},#{pageSize}
     </select>
     <select id="selectCourseCount" resultType="int">
         SELECT COUNT(*)
diff --git a/test05/src/main/resources/test05/mapper/StudentMapper.xml b/test05/src/main/resources/test05/mapper/StudentMapper.xml
index da265ab..4c56441 100644
--- a/test05/src/main/resources/test05/mapper/StudentMapper.xml
+++ b/test05/src/main/resources/test05/mapper/StudentMapper.xml
@@ -19,9 +19,10 @@
           AND #{student.sex} in (N_SEX, -1)
           AND #{student.grade} in (N_GRADE, -1)
           AND #{student.major} in (N_MAJOR, -1)
-          AND VC_DETAIL LIKE CONCAT('%', #{student.detail}, '%')
+          AND (VC_DETAIL LIKE CONCAT('%', #{student.detail}, '%') 
+           OR (#{student.detail} = '' AND VC_DETAIL IS NULL))
         ORDER BY N_STUDENT_ID DESC
-        LIMIT (#{page}-1)*#{pageSize},#{pageSize}
+        LIMIT #{offset},#{pageSize}
     </select>
     <select id="selectStudentCount" resultType="int">
         SELECT COUNT(*)
diff --git a/test05/src/main/resources/test05/mapper/UserMapper.xml b/test05/src/main/resources/test05/mapper/UserMapper.xml
index 0c1e097..c2c9146 100644
--- a/test05/src/main/resources/test05/mapper/UserMapper.xml
+++ b/test05/src/main/resources/test05/mapper/UserMapper.xml
@@ -14,7 +14,7 @@
           AND VC_LOGIN_NAME LIKE CONCAT('%',#{user.name},'%')
           AND VC_PASSWORD LIKE CONCAT('%',#{user.password},'%')
         ORDER BY N_USER_ID DESC
-        LIMIT (#{page}-1)*#{pageSize},#{pageSize}
+        LIMIT #{offset},#{pageSize}
     </select>
     <insert id="insertUser" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO t_user