From 6b93cb7d29bd1b04c3ad3d9874cef60ddf811a0d Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Fri, 22 May 2020 00:13:13 +0800
Subject: [PATCH] update code

---
 .idea/workspace.xml                              | 12 +-----------
 src/main/resources/mapper/generator/StaffDao.xml |  8 ++++++--
 target/classes/mapper/generator/StaffDao.xml     |  8 ++++++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 652d89a7..7b169cb8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,18 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SyncnizeFlybookDataJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/job/task/SyncnizeFlybookDataJob.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -166,7 +156,7 @@
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
       <workItem from="1588936950753" duration="95758000" />
-      <workItem from="1590038091791" duration="22362000" />
+      <workItem from="1590038091791" duration="23054000" />
     </task>
     <servers />
   </component>
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index a27798e0..a917b1ae 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -100,7 +100,11 @@
     <select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
         select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
         case lso.staff_status when 0 then '在职' else '离职' end staff_status,
-        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader
+        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0
+        <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.staff_status=#{staffStatus}
@@ -118,7 +122,7 @@
         <if test="departmentId != null and departmentId != ''">
             and sr.department_id=#{departmentId}
         </if>
-        ))
+        )) order by department_leader desc
         limit #{startIndex}, #{pageLimit}
     </select>
 
diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index a27798e0..a917b1ae 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -100,7 +100,11 @@
     <select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
         select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
         case lso.staff_status when 0 then '在职' else '离职' end staff_status,
-        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader
+        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0
+        <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.staff_status=#{staffStatus}
@@ -118,7 +122,7 @@
         <if test="departmentId != null and departmentId != ''">
             and sr.department_id=#{departmentId}
         </if>
-        ))
+        )) order by department_leader desc
         limit #{startIndex}, #{pageLimit}
     </select>