diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 23e1cdc3..664c39c0 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -475,8 +475,8 @@ case occ.staff_status when 0 then '在职' else '离职' end staff_status from (select staff.id as staff_id, staff.name as name, relate.is_leader as department_leader from lz_departments_staff_relate relate join lz_staff staff on staff.id = relate.staff_id - where relate.department_id = #{departmentId}) jj - join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 + where relate.department_id = #{departmentId} and relate.is_delete=0 and staff.is_delete=0) jj + join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 and occ.is_delete=0