diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 546fa963..2221ceb7 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -265,6 +265,7 @@
and staff.name like concat('%',#{name},'%')
+ group by staff.id
) as staffinfo join lz_staff_occupation as occ on occ.staff_id = staffinfo.id
where occ.is_delete=0 and occ.staff_status=#{staffStatus} order by department_leader desc
limit #{startIndex}, #{pageLimit}
@@ -274,17 +275,18 @@
select count(staffinfo.id)
from
(
- select staff.id as id, staff.name as name, relate.is_leader as is_leader
- from lz_staff staff join lz_departments_staff_relate relate on staff.id=relate.staff_id
- where staff.is_delete=0 and relate.is_delete=0
-
- and relate.department_id=#{departmentId}
-
-
- and staff.name like concat('%',#{name},'%')
-
+ select staff.id as id, staff.name as name, relate.is_leader as is_leader
+ from lz_staff staff join lz_departments_staff_relate relate on staff.id=relate.staff_id
+ where staff.is_delete=0 and relate.is_delete=0
+
+ and relate.department_id=#{departmentId}
+
+
+ and staff.name like concat('%',#{name},'%')
+
+ group by staff.id
) as staffinfo join lz_staff_occupation as occ on occ.staff_id = staffinfo.id
- where occ.is_delete=0 and occ.staff_status=#{staffStatus} order by department_leader desc
+ where occ.is_delete=0 and occ.staff_status=#{staffStatus}