From 90fd42b7f661afca19143ababb695c62fe37071f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 26 Nov 2020 18:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/generator/StaffDao.xml   | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 0c17f05a..546fa963 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -248,43 +248,43 @@
 
 
     <select id="getStaffInfos" resultType="com.lz.modules.app.dto.StaffDto">
-        select ls.id staffId,if(lso.employee_no='', lso.staff_no,lso.employee_no) staff_no,ls.name,lso.position,
-        case lso.staff_status when 0 then '在职' else '离职' end staff_status,
-        if(ls.id in (select staff_id from lz_departments_staff_relate where is_delete=0 and is_leader=1
-        <if test="departmentId != null and departmentId != ''">
-            and department_id=#{departmentId}
-        </if>
-        ),1,0) department_leader
-        from lz_staff ls,lz_staff_occupation lso
-        where lso.staff_id=ls.id and ls.is_delete=0 and lso.is_delete=0
-        and lso.staff_status=#{staffStatus}
-        <if test="name != null and name != ''">
-            and ls.name like concat('%',#{name},'%')
-        </if>
-        order by department_leader desc
+        select staffinfo.id as staff_id,
+        if(occ.employee_no='', occ.staff_no,occ.employee_no) staff_no,
+        staffinfo.name as name,
+        occ.position as position,
+        case occ.staff_status when 0 then '在职' else '离职' end staff_status,
+        staffinfo.is_leader as department_leader
+        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
+            <if test="departmentId != null and departmentId != ''">
+                and relate.department_id=#{departmentId}
+            </if>
+            <if test="name != null and name != ''">
+                and staff.name like concat('%',#{name},'%')
+            </if>
+        ) 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}
     </select>
 
     <select id="getStaffInfoCount" resultType="java.lang.Integer">
-        select count(ls.id) count
-        from lz_staff ls,lz_staff_occupation lso
-        where lso.staff_id=ls.id and ls.is_delete=0
-        and lso.staff_status=#{staffStatus}
+        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
+        <if test="departmentId != null and departmentId != ''">
+            and relate.department_id=#{departmentId}
+        </if>
         <if test="name != null and name != ''">
-            and ls.name like concat('%',#{name},'%')
+            and staff.name like concat('%',#{name},'%')
         </if>
-        and (ls.id in (
-        select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0
-        <if test="departmentId != null and departmentId != ''">
-            and dsr.department_id=#{departmentId}
-        </if>
-        )
-        or ls.employee_id in (
-        select sr.leader_employee_id from lz_departments sr where sr.is_delete=0
-        <if test="departmentId != null and departmentId != ''">
-            and sr.department_id=#{departmentId}
-        </if>
-        ))
+        ) 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
     </select>
 
     <select id="getBaseInfo" resultType="com.lz.modules.app.dto.StaffBaseInfoDto">