From d881e9336bab430ffa0f738d4c5f18e5070cc29f Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 15:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/generator/StaffDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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