diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b0457764..c61fac52 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,10 @@ - - + + diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index 403fbec7..fe0657e0 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -81,7 +81,7 @@ public class StaffServiceImpl extends ServiceImpl impleme if (intoStaffStatus == 1) { staffStatus = intoStaffStatus; } - List staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, currentPage * limit); + List staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, (currentPage - 1) * limit); return staffInfos; } diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 0be3b68e..33c85b8d 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -122,7 +122,7 @@ and dsr.department_id=#{departmentId} - and dsr.name=#{name} + and ls.name=#{name} diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class index d752860b..8756a764 100644 Binary files a/target/classes/com/lz/modules/app/controller/StaffController.class and b/target/classes/com/lz/modules/app/controller/StaffController.class differ diff --git a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class index 4b45aeae..8440cc57 100644 Binary files a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class and b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class differ diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml index 5c27ce2e..33c85b8d 100644 --- a/target/classes/mapper/generator/StaffDao.xml +++ b/target/classes/mapper/generator/StaffDao.xml @@ -108,7 +108,7 @@ and dsr.department_id=#{departmentId} - and dsr.name=#{name} + and ls.name=#{name} limit #{startIndex}, #{pageLimit} @@ -122,7 +122,7 @@ and dsr.department_id=#{departmentId} - and dsr.name=#{name} + and ls.name=#{name}