From f75bc6c30efed8fc48cfbe90dcb9562fb174ca82 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Tue, 19 May 2020 09:58:50 +0800
Subject: [PATCH] update feishu logic

---
 .idea/workspace.xml                           |  33 +++++++++++++++---
 .../app/dao/DepartmentsStaffRelateDao.java    |   5 +++
 .../modules/app/dao/StaffOccupationDao.java   |   1 +
 .../DepartmentsStaffRelateService.java        |   3 ++
 .../app/service/StaffOccupationService.java   |   2 ++
 .../DepartmentsStaffRelateServiceImpl.java    |   7 +++-
 .../impl/StaffOccupationServiceImpl.java      |   7 +++-
 .../modules/job/business/FeishuBusiness.java  |  11 +++---
 .../generator/DepartmentsStaffRelateDao.xml   |  10 +++++-
 .../mapper/generator/StaffOccupationDao.xml   |   6 +++-
 .../app/dao/DepartmentsStaffRelateDao.class   | Bin 967 -> 1145 bytes
 .../modules/app/dao/StaffOccupationDao.class  | Bin 1109 -> 1145 bytes
 .../DepartmentsStaffRelateService.class       | Bin 756 -> 789 bytes
 .../app/service/StaffOccupationService.class  | Bin 1063 -> 1099 bytes
 .../DepartmentsStaffRelateServiceImpl.class   | Bin 3782 -> 3888 bytes
 .../impl/StaffOccupationServiceImpl.class     | Bin 3019 -> 3140 bytes
 .../modules/job/business/FeishuBusiness.class | Bin 6109 -> 6364 bytes
 .../generator/DepartmentsStaffRelateDao.xml   |  10 +++++-
 .../mapper/generator/StaffOccupationDao.xml   |   6 +++-
 19 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c61fac52..466096f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,25 @@
   <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/dao/DepartmentsStaffRelateDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffOccupationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffOccupationService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" 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$/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/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.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/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffOccupationService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffOccupationService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/job/business/FeishuBusiness.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/job/business/FeishuBusiness.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsStaffRelateDao.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" />
@@ -154,7 +169,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="62703000" />
+      <workItem from="1588936950753" duration="69525000" />
     </task>
     <servers />
   </component>
@@ -212,6 +227,16 @@
           <line>79</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java</url>
+          <line>42</line>
+          <option name="timeStamp" value="66" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java</url>
+          <line>80</line>
+          <option name="timeStamp" value="67" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java
index 80730388..0c6e86ff 100644
--- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java
+++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java
@@ -32,10 +32,15 @@ public interface DepartmentsStaffRelateDao extends BaseMapper<DepartmentsStaffRe
 
     /**
      * 根据staffId修改departmentId
+     *
      * @param departmentId
      * @param staffId
      * @return
      */
     int updateByStaffId(@Param("departmentId") String departmentId, @Param("staffId") Long staffId);
 
+    void deleteAllRelates();
+
+    String getRelateByStaffIdAndDepartmentId(@Param("staffId") Long staffId, @Param("departmentId") String departmentId);
+
 }
diff --git a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java
index c4bd1a70..056bb8a2 100644
--- a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java
+++ b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java
@@ -27,5 +27,6 @@ public interface StaffOccupationDao extends BaseMapper<StaffOccupationEntity> {
 
     StaffOccupationInfoDto getOccupationByStaffId(@Param("staffId") Long staffId);
 
+    void updateAllOccupation();
 
 }
diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java
index a8e6a430..64dfbbdf 100644
--- a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java
+++ b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java
@@ -24,5 +24,8 @@ public interface DepartmentsStaffRelateService extends IService<DepartmentsStaff
     void addRelateInfos(String departmentId, List<Long> staffIds);
 
 
+    void deleteAllRelates();
+
+
 }
 
diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
index 61082eca..674e5d8c 100644
--- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
@@ -26,5 +26,7 @@ public interface StaffOccupationService extends IService<StaffOccupationEntity>
     int addStaffOccupationBatch(List<StaffOccupationEntity> staffs);
 
     StaffOccupationInfoDto getOccupationByStaffId(Long id);
+
+    void updateAllOccupation();
 }
 
diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java
index 15ee2596..45152e30 100644
--- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java
@@ -39,7 +39,7 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl<DepartmentsSt
     public void addRelateInfos(String departmentId, List<Long> staffIds) {
         List<DepartmentsStaffRelateEntity> departStaffRelateList = Lists.newArrayList();
         for (Long staffId : staffIds) {
-            String departId = departmentsStaffRelateDao.getRelateInfoByStaffId(staffId);
+            String departId = departmentsStaffRelateDao.getRelateByStaffIdAndDepartmentId(staffId, departmentId);
             if (StringUtil.isEmpty(departId)) {
                 DepartmentsStaffRelateEntity departmentsStaffRelateBo = new DepartmentsStaffRelateEntity();
                 departmentsStaffRelateBo.setDepartmentId(departmentId);
@@ -53,5 +53,10 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl<DepartmentsSt
         saveBatch(departStaffRelateList);
     }
 
+    @Override
+    public void deleteAllRelates() {
+
+    }
+
 
 }
diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java
index 17959120..42132a13 100644
--- a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java
@@ -49,7 +49,12 @@ public class StaffOccupationServiceImpl extends ServiceImpl<StaffOccupationDao,
 
     @Override
     public StaffOccupationInfoDto getOccupationByStaffId(Long staffId) {
-        return null;
+        return staffOccupationDao.getOccupationByStaffId(staffId);
+    }
+
+    @Override
+    public void updateAllOccupation() {
+        staffOccupationDao.updateAllOccupation();
     }
 
 }
diff --git a/src/main/java/com/lz/modules/job/business/FeishuBusiness.java b/src/main/java/com/lz/modules/job/business/FeishuBusiness.java
index 43c7a296..a2481243 100644
--- a/src/main/java/com/lz/modules/job/business/FeishuBusiness.java
+++ b/src/main/java/com/lz/modules/job/business/FeishuBusiness.java
@@ -1,6 +1,7 @@
 package com.lz.modules.job.business;
 
 import com.google.common.collect.Lists;
+import com.lz.common.utils.DateUtils;
 import com.lz.common.utils.FeishuUtil;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.entity.StaffOccupationEntity;
@@ -73,11 +74,14 @@ public class FeishuBusiness {
         List<DepartmentInfosBo> departmentInfosBos = feishuUtil.getDepartmentDetails(token, topDepartmentIds);
         //更新数据库中的部门相关信息
         departmentsService.updateDepartmentInfos(departmentInfosBos);
+        departmentsStaffRelateService.deleteAllRelates();
+        //未在飞书组织架构里的成员，置为离职(全部置为离职，再把在职的恢复)
+        staffOccupationService.updateAllOccupation();
         //获取飞书部门对应的用户详情
         for (DepartmentInfosBo departmentInfo : departmentInfosBos) {
             //获取部门用户详情
             List<DepartmentStaffBo> staffs = feishuUtil.getDepartmentStaffDetails(token, departmentInfo.getId());
-
+            System.out.println("=============================" + departmentInfo.getName() + "================================");
             for (DepartmentStaffBo staff : staffs)
                 System.out.println(staff.getName());
             //循环录入到员工信息表中
@@ -88,8 +92,6 @@ public class FeishuBusiness {
             //录入员工职业信息表
             enterStaffOccupationInfos(staffs);
 
-            //未在飞书组织架构里的成员，置为离职
-
         }
 
         System.out.println(departmentInfosBos.size());
@@ -108,8 +110,9 @@ public class FeishuBusiness {
                 staffOccupation.setEmployeeNo(departmentStaffBo.getEmployeeNo());
                 staffOccupation.setStaffType(departmentStaffBo.getEmployeeType());
                 staffOccupation.setStaffStatus(departmentStaffBo.getStatus());
+                staffOccupation.setEntryTime(DateUtils.getCurrentDate());
                 StaffOccupations.add(staffOccupation);
-            } else if (staffOccupationEntity.getStaffStatus().intValue() != departmentStaffBo.getStatus().intValue()) {
+            } else {
                 staffOccupationService.updateStatusByStaffId(staffId, departmentStaffBo.getStatus());
             }
         }
diff --git a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml
index dcfbae40..5fb0aadb 100644
--- a/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml
+++ b/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.xml
@@ -21,12 +21,20 @@
         </foreach>
     </insert>
 
+    <update id="deleteAllRelates">
+        update lz_departments_staff_relate set is_delete=1
+    </update>
+
     <select id="getRelateInfoByStaffId" resultType="String">
         select department_id from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId}
 	</select>
 
+    <select id="getRelateByStaffIdAndDepartmentId" resultType="java.lang.String">
+        select department_id from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId} and department_id=#{departmentId}
+    </select>
+
     <update id="updateByStaffId">
-        update lz_departments_staff_relate set update_time=now(), department_id=#{departmentId} where is_delete=0 and staff_id = #{staffId}
+        update lz_departments_staff_relate set is_delete=0 and update_time=now(), department_id=#{departmentId} where is_delete=0 and staff_id = #{staffId}
     </update>
 
 </mapper>
diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml
index 3b5ff56c..39209b41 100644
--- a/src/main/resources/mapper/generator/StaffOccupationDao.xml
+++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml
@@ -37,7 +37,11 @@
     </select>
 
     <update id="updateStatusByStaffId">
-        update lz_staff_occupation set status=#{status} where is_delete=0 and staff_id = #{staffId}
+        update lz_staff_occupation set staff_status=#{status},resignation_time=null where is_delete=0 and staff_id = #{staffId}
+    </update>
+
+    <update id="updateAllOccupation">
+        update lz_staff_occupation set staff_status=1,resignation_time=now() where is_delete=0 and staff_status=0
     </update>
 
     <insert id="addStaffOccupationBatch">
diff --git a/target/classes/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class b/target/classes/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class
index f24b88af0be947622688b94505f258d30d1939da..bfe9e4c2c7824b4631b835a2bcab6fa9fecc9d42 100644
GIT binary patch
delta 229
zcmX@k{*y!a)W2Q(7#J8#806U*WY`&G*%{<E3eRMW6G%zTNi9ir%*hE#%}FdtEoNk3
z*3b-NWKc{`ErAF*RR)(NrlonNIOe6eq!uI=mE@-8m3XEwGMH)jWF?j*>gOcprR)3T
z=cQXC@q<f>GABDSN^D-kSjNc6I$4>yEsBMaL6|{=fdNR1GKeuSF|YyM#L2|K52S>E
tm<x!-nHU%uxPh3b7$^>B3NbJ<Z~&#57{nPQz_cWT6p&^EDv@Sj00475E-nB7

delta 70
zcmey#ahzTF)W2Q(7#J8#7^K-5B-j}w*%_oZ3eRNRti)8t$jCf-CUct{12Y2$Pze)*
UFoOt~7G)3v(rgTj4B`w704)0o)Bpeg

diff --git a/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class b/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class
index 2efd6981dd8dc414e5d801500a33233bdbc8f65f..3d01e38a33b856e2682de6979d083cc6d928daab 100644
GIT binary patch
delta 120
zcmcc0@smUD)W2Q(7#J8#806U*WY`&G*%{;*8Kl!wOM*)h)6yniWE9<K{GCxsxU?W8
zu_V<oC&xcIxwIg$Br`vck%3u5Gi<X4Q!*nX>*OBh)oLt^45AETK;xJh1c4+IgE)f(
Qn3iOa0@7>@K%*HL0InPvF#rGn

delta 85
zcmey#ag{^v)W2Q(7#J8#7-ZQQq}Umx*%@RQ8Kl!wOM*)h)6yniWE9<K{GD;L8&e`9
kBg^C!%&X-Xm>C3tI+z$l8N|S}ID-U`W@BJvkYr#00Ie<%l>h($

diff --git a/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class b/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class
index 4d47918133bea40bf304abf8402cbc38fa483bb2..a3bbe81be16d3040165094a1d1a82150a07ccabf 100644
GIT binary patch
delta 88
zcmeyuI+acM)W2Q(7#J8#7{u8bMA#Wb*%`z(3i~sP3Z$gwq?V*Q=HvvW<|LM+7Bez1
kYiy2V^kigYp1gv|N{WS%fuBJDsFjI<1564s2!Ux~0Koqcp#T5?

delta 58
zcmbQr_JvjW)W2Q(7#J8#7)03_gxDE`*%?GO3i~r|u4Z&)WMrCrkjYAjfr)_wsDz1u
KpFsdj3jzR=N(t)#

diff --git a/target/classes/com/lz/modules/app/service/StaffOccupationService.class b/target/classes/com/lz/modules/app/service/StaffOccupationService.class
index 49721262bee4643a83cb0987d32cc03659c8e01e..9f53667c02a68fda0b77557efb6f819c57253544 100644
GIT binary patch
delta 93
zcmZ3^ahgN;)W2Q(7#J8#806U*WY`&G*%{<E3db=?36~b6B$lK)=H&P%Czlo^mSpDV
pF)}b~XohXhXEI`BWShK*xmb#YkwKh60;r#ffdfoRGDv}GX#ixZ67>K8

delta 58
zcmX@jv7AHr)W2Q(7#J8#7-ZQQq}Umx*%@Ru3db>R?qxDyWMrMZkGWWgfr)_wsDz0@
KoIwIiO9B9zx(ZnU

diff --git a/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class
index c72109d19041c2eedaf1ea5b2f6e871c7ca4974b..fe3831479d91cbab211d6cd284769484d511562c 100644
GIT binary patch
delta 742
zcmY+CNl#Q!5QV?n)0Nj3Bm_;sfPy$gP{5&82DK5QNCOILt2ofoj}~kiga)M@0O#4n
zw=yyDFF<f1niy9u+^C5=m;M5O0LFTaCc3y)r|vm*s&aEbmdut;efstGJ+Pf;7OUvg
z9JcV#>4qbkE(^a~6w|FaYO#!C7RQMOIl;*wr|5CRY0a4&(VPu(j$Vrx=QVv61#W8r
zaW~j*OTWt{T-62Fb3hXu)Lhgg6-9BUHn3vuRn%t<X;NaT8Gi0>D9n%BNjq(algTbS
z8B5z^iXYC5r+7Z<A6MQHE;*kAO}<e@i8B`{biSyZHbWU>nzUh@3C)n<GFQaZFiFO6
zm1~N;!PrEsIvGnPsw2axgrS5|&2_^KrZm%r8Ez^<&a5X?YPiL1!yWD#?s4DnfQN=h
zJT^Sx>HJsy-P2N*u+vKmHcfV?WBvWD@o*~MY>&i7(?fPD-5M9SjgkMS*8fv?r$-0o
zzgZcjd`_qN8H(VQ_lC?Htd6P$f{Hp{k#7N`ctNj=aupxQtMhMq&GI6D<pTL$XFRt>
zy>#B?u9>Q#l3i30W-|xaLI>4EsiBWrM%cy}JLEk=tdk)J(V|-^)lNY*?32#j1SprT
zI_l*Y$Rey~gJc&q2&=NFkv;NPd`z%ckXPm)J|0Azp;3(fl3^j6ge=Clh|%oVG%wQb
zOy^bfC|RIf4A%-@DaW-|a}qpMNDO2z>a&}gCGyWMUbbdctsKhcHdadxiY6kbeT<IZ
Du78HS

delta 644
zcmYk4$xl;J6vltIeXkc^FKAeh6jD%vl_**#L<^|k5Rifb3eH%ht=8Hq6tp;0oF`oP
z7RH5P=URdbF~+!Z;lJV5jaw6l=aHDWxaWK~-#OoR?(m`Zd${yt`SVv`C$Ai8=+hi^
z@X_amW14;k+uKw#pc!;1<G8~KhJp-pGRP@Td*O`c>?)}_7vwx64i`vhMja}>)=DmV
zVa#hudR)q@N_(1@G|pvBMsr0Ga_0h7^K-+Nlhs@mMNRIt-KKuJGrsDDj6JCWd9Ep1
z-F`ddE(apkbw$|yqQYH<b&P8!3<V}NS;G`JM8t5DqG6g_ii%8PDiO^la_MM1pGzCU
z)M{=U?r>LAGTdXvoz<;%_jzD=$RopJo*16;%<!BShL_ALI@~{YjayKWg~qZszQ(F_
zvM`X$CJM>!Tq@sL94sVKsqQgFLu34Z!v!lit(4y_ncvMl_~jm<_z9=4X_25JW`(Rp
zjN&aL9x7LSqatQ+{K)E%y~rA$`@Z~;dguNsUt5Z@i58mJ&t?v@g<hfzv6WG_k!J_v
zG|Rbnv0gm7&{9_=yB0xF!MoW*fO_eQ(JGHCa}Z&JWDm6ot5#4ud*usQOtMdqUwjZ9
zA5vVTU4;IT9YS^rS&g-X(HzhmTq5qyS2Wc7*)EJv#^_$jN2rq=6pJ2N@d<kW0&ya9
A(EtDd

diff --git a/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class
index b62b6344b2c2ca38649dfc3ca220deb229791974..a4f3fa1c578ae490aa09a42413dc251b335656bb 100644
GIT binary patch
delta 880
zcma)5OHUI~6#njDJDr&uL4gh}ts;Whf)3THSRYWu7izJ-my*hYq)?D{p_{r^ck@Ri
zu)#!Et~BvC=udFv&iI{~NgGK_T-@`WdtUdPZ_a#mKMy_q^83Rl07X2paR6l#S8Nz4
zi@0iH-bPF=eYj@gx{U;GSiIbHa0?3}Zi~1h;;x8_iA59lOjNfjzxKKPt@Y<i&E;~v
zzF4cZ)|Z+qjWvaDe$_~CKZ_OAn2RBWRIRb<)n9pp)yA6FYOd5by=rUu#Y>I*c;IiC
z8UK4C=D$uj{*U-Td=w8Avi>`j&1txJq|uK76OT3WnAA84PvaC$Ys}!hMoFG1`O~Vj
zy<zUCTp!0&ILHIZBMwrF6O%-f$fhV$e#J^oq$3{~IZR#C19Fl<mZ)$Dhtb2>w^l)=
z{g0O0mZ%ZhM21nKjo=8RvV~C`CAVYrCyAkNyyH7Y+XSsK#T4K;kAWQB9F1Cv_gSJO
zI{6*gle=&Xybr>HUe7TW7!R5aA8<NtIGDl-`lAP?7^s9UDeS+ovkTp6^Fe`d4&5oB
zqXNRiGz!d<QkFq8XpnLwJ|N_$ooRQ=dH?9Ah%?L)GD2b<F5=m4hebL<3S=yPPU)1k
zy%g;KivotqLJzkI|3v{;ggH`phA7##aJ!3Mg)QC;$RzShfGt>DsqQM+5jj0kqZe>7
S$hd^TUMddDUFMnH#M~d9YgUH<

delta 815
zcmZ`%O;6NN6g{t<@y)a^s0`3y_^=>~cF@WQsGy9BprWF<(v2I!f&?THS?C5={(=4r
z!vX@4D2Xdqknmez#m;zc+cb@di}&vLx#!;Zepe5@xr0AHe*qZ5YX@gBsnK*`VN$O9
z8V?*4#c07pjVT8uJSx+eb}@s;ay^mjsm83vGmYolZ%zy9C^|0HcD@vc)nGe16gn4H
zSHk7bA;rq-`*8i^((+n3zrOh4lfetjDNIBsrQYaU$&Hk5vwggbs=B|{j#mcf(W)_T
za0OQlhH%Z`28MUu=@YflLcR*;cpzz%6>4WF+fvEyv^-iNrQ{WZJ*aIe7OH6ynBGa<
zBnhaYi<Uw+dSJ)JUs0e2_`yD`w|lVb-%;3)j>^>y0cm9zEGo04Lg~Se0sW*X1!OsT
zae=@dGkx@tLO<&|D3jR5EH*&jC3=gBCBS7K3xf=E3)EzwCZ&aF(W%57WNNTR21yXz
ztgnjzb;eV~fGJ8=nIg@Src7soT{!ijA22pHY3DZ-<OVVsu!(^Oq_e?w?l@sxw&({P
z(uc1_bT8_1yK_Xt{}659CTnCZ$!oZ1@MmV!8w@1N7^QOzx6%>DXvr2WwIz4%X-9I6
enpVbK82+;oJ4L>YJ2A$1{F_`NPw?Db!@a-6dPd6t

diff --git a/target/classes/com/lz/modules/job/business/FeishuBusiness.class b/target/classes/com/lz/modules/job/business/FeishuBusiness.class
index 7ae170e31e31f36274a87d36f1b2d64e9d4c1bd5..b0480276e9bcae0eecd9a018025287ade2b8c054 100644
GIT binary patch
delta 2351
zcmaJ?33O9M6umEPGCx1lg$B_`OF^Ktr5I2_2?~?~q5>5J#0@NMz+$@CrYN|?eOH92
z2q@rMcaUNrpokkNDk?50io3Y)8=|z{`Kim1bLcsld2`=7@7?*`5q!5_Y;)_{^#Bf&
zJ~qlQ&x@g$ZzGNy&2p0uH)DaqEjB!uXATQ}ScJu9xmDpdg(WsL=2=*3_GK1sH~SsN
z{7w_#E+g^i!`)`N$6(DS$Gtw>hx@&V4aEaKJcx%3_^=Plu|nYy8(px{*tU4F3XfVy
z7-Y4DH8zr1tFX>S0ahEI$9#Ak>rIF!Y#uilgC}h~g{O_lGe-NYjg8o3Vn3(wyp2OJ
z&n%mbLD>sNe9?$68EK1=UN+JzHeSV6BfVxW{<`sh!z^zqY_ste-ZtsCE4*`OiMTV^
zi+9;5g&nNFWuRw*WNc%d3hybr&$RJH>XW<^FhOG^j#l_U<3oI;@i9K3qsFJ$8DDI5
z&i)LaGla$$_)_C5d>!9tm6m^lZv|4I@ttw`2H$J^fFCt}!cL8!@r%Z<=6EcQQ}|6|
z7tYZbgRu&~YwR{D$6>s}9~ysRf}nr=Ece0jY>x_S>@fjb@uNbUW(pDH9ks7NEiQZ{
z=(;Z(qf?TmC0*R9Z2bpol;e0M9xX~NEncxT&Ssgk@hQ<-G9*(=7ORnL>A<G3G|AE8
zmyUv9{31_qn3nydla~FB%>m-p5|9J6be3E#c}D6Yxk~c2bd_#e4wCL#dPq+#1=34P
zp%e*<d2fGwksa_AYw0Z|8pAQ7Wxd_(k|UVGAJ5LT;&U?dJ7!mfBjIScG!hvfj#Na$
zje>sd1{v{nS^kdxrur)4G$^mEY^tw_R@c?WD>MFRS(qu(vL&mN#PTZZYJ!nDL2fm5
zwZW!nb)+#koK6#sB*>f*j+QkwG=yuT1{LHK7LA@+F{{Ecbu0%7bYnO=qBhzvdqQ;$
zZTyA*Hz}GVNUNx-671Kmi&WIk2$oyZW`--HgNja$_wBHjZ>)?@+=E<mV@fa_gkY3|
z3XX9w(&s<eXa^&U_QE*Hy)Y8&e^@%tq&wG%CVY^BaCaB4hCD*Sg-KjJ4w#D*DeII0
zCgUWY1ShAwfwV)B&W{IVS$t*Aj%mfKa9|RhInY(eO(IVaa3^62LY{yp39n!w;zqIs
z8_*@BXy@u3PzmHG&^2VOM7MR&C#^<C&Or%e8AW&QIX$=}&>?}I@yGqSv4W6I%YdCg
zFG9_2?=wtcz)GUXg^<@2;e-r$lPFF@allHTcXL~{@nJb+egY-tqUp{>8`yk)W#Pr)
z$iYD5BZRIPj6w|IFiKH{VW{Vr=5j<2aY!p-gj+bFjeOQyF&aDgqIdEYeTQ+9i4!D`
zPk9I?$`nkJ2qw#HoFZ4@G?|O3G9MMP6qQa_FGU7}cEKq)6&6zr#c7zrzK_IAOeN-K
z1RqXE1>2Q}227*YVzgK%2AINbX5u1N7ltweXdjMO7GOG^Nn5!dGic{Rp`3#=P>nQ}
zyq&>M<;}NZ3(ln0jfiu5cY6Uf@U$nZb&{D}b?i+lS`DLZjXAFMbUll%BVg}AzCwdS
zBR^VM3Q>ioR*XtPly_mkZn#=8{2!zh<qEUtK<#dH--Vv6mmeKgIFWbR!rjZzEo;zc
zOmBxkWBatz=ej=0Sc*Ocp>${N=?NU1M3AF*2iytt4S5LX8kY4VrUGgcMy$gjWYwV|
zD_{jY2^_|aZv7J&kdh8h;E0qoFo96OT7y9e99d#Gb(9MyHlt%IrtumWOJZ;u!M6Gm
zhfPb6X|y~Hq3yrK8Vf%!F`dnxK~kN;hgOXNY=0RWKZ<Q1hZ+v8mUFG+sUEY~&kH!`
zE7-`Z5yfI6OW2lXHfAN}IGh<zro_fE%xnS{Lq>2e&f_QskO$|}-NW#c5u;Wy>3O)2
z^hr0pZ0CoO43UKBa`MOU!!V!|_mr;oAKk^o%!o_j-UDB1Ty3}@220@*=V%6~aH+y&
z3YRNZjy7Z?{l9AP|D4N@D;b9`ZyL9&_;c}w7OwgGJA!UZYW}=AL)W0R1;b1m#d)8p
a4^bXnt|jKebse0qqmSzA`J3B_8~y?w<=8d=

delta 2060
zcmZXV2YAy(7{-5>Cb{IFE31kIC<Rf$0*%P97Ew{a2?8P&7gj8@R*-_*xF^myz=4~(
zMXHga;NBZW1*{YI-iXrrUQ*FV+vk7x-gn=)@BO~JyxXrSm42al*$QBQ=@zgH^WqHV
zqJWFJ#1EGyxQxp!nSdzs{NjoPS8|mfuC~m#EC_JSi*b#guZ?k?pRf1o3%!FIJkm13
zjefYv%Wn2DZb@(}w^`DQ0y<Ie<+oezh;t`*1r&34z&+gSHSbHXnEO3ilAwVH0-*=}
zZZ_Z{mU`tzud*!QVIJ{%%M+~NQOjcieVONn$Gz4Q9zE&NQyx9-(KBTpKI=1k&ZFl8
zUf@M<|B@eGw!9MXDzACBuUl5$GSoy0mG&Fr#PX(PQNyU{I8*qF&Td&{c}rn4_t|yD
zquAdul-(_FJKkZnV-0I%=y;c=%;H$*cJJ}NTsS`9L&ryaoLL(iI&dAI7|gbgPrb=H
zK68A|7mhD!a(u<tj&J;OI3q0II=*AJVPIzaa9L(~*cLjz_hvuvMP52^lI2IoPyFoo
zh1Hf{9lx>Ou@C!Nes^r(5652YZTZu&k!HuS%=S7h*5HgWA!iEY(u7S!`N_YDI`(6v
zHP)G!i5pUxTASM4nZP8RabCAj5lkD?)|qyuy)zv=D)MMEv$-=JO<QZWaAr$oWRj+n
zGo4KrLuuy3g3>~3ik<0dN*uegTSK=*eJC@r&F`i>b6R1~%y)%F4F|Q=q5553(66Dg
z-IgY^rhV74HdCtW4ydb|JXu5C9P!b9dez*jR83Xwl+@m}b=6a<k2S=m)z*!#s+m)r
z`L+GB^kB6*>dY=aj1az381@i~Y95x8iR6FD_RPt|)&FE7^M5i?^dDJRYc++&(V0|H
z$NpnlV?k%e3OnsUgaa6-*>GT97eYS~*4@F>WR5RtN+%<Y#0(YDWV8|SzkpdD1%}7y
zRAEaWAk;f)vvkhVr6QJ$<+bC<c&m1?M>*}{ieL#{lR=h}EZyo`-j{86Z?IK}inta%
za(=x2)&-O%V_CMTPq$p?jdX~JA<MS+>#$*bGLuPa>`$CQbfBCPcA^_Y=q0j8h~}e2
z@=VcuiD<q@6fag6H?Swqh|-m!ut}8t$^It67*onvQ_eUuoJw;b6U-qTW)5efnL)ZL
z$JSXC%28LwQ%Ov2cjF)?sCFZm&cTvJ<RZZ#9I8|kjOH-y#^kOehYQ6OXrlg)z<OR=
zIggu3RLR!R!5qwy(hJec3}cdxUZ7(xqMFLIvR%nF%65W^HANW@(40TORHCiHrfmu~
zUBUA1rpjI3a)vBwWI3E*BPEujEw#FRZ7s)GW;U}|UL?GpK^q7)v%@Ayx|zO~S+daf
z270V#8y#4;R!1DIWL9a8%lC?<^c>kcSNu_ZTT4G*ptbVhT&=@ddNs10${k5YvXoXt
zCGPFpsgGnfX`f}t!}Oi-5M{oVlF=;blxEp&pQT?O?U1E^9u3Gcu#az`K_M#Z>FL{N
z$1LSuUwh>@uvy-JPSD6s1yXCN?vv}Kg|zXTT2#pTpSIdZ&4elt7W*YkPLmSrgP5u=
znx>~~x_WPhieICG9j&pJxg0}U6}ggGD%ouAppGTXVL8X;T4$^pW(;ML&JjvUI#*vr
zK4)?~C#Z?`P{~i!u2sNuIY~_v_KfD*BrPQ9`^iYWjFWSH;v1o(3Y_1YwrTGa$$Y7Y
z64^*1U$qtmj9E_2t$Z2vGiW)@a=PUVXrTw;e{Z8_I#k4&auYG*6&lXc7vgN4|D3;{
s3A!t&|BH7Ryp)|A7~(lJxvS~lH1yhql#Vw%Pbs4NVK`sk1+%&EFXQBjod5s;

diff --git a/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml b/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml
index dcfbae40..5fb0aadb 100644
--- a/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml
+++ b/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml
@@ -21,12 +21,20 @@
         </foreach>
     </insert>
 
+    <update id="deleteAllRelates">
+        update lz_departments_staff_relate set is_delete=1
+    </update>
+
     <select id="getRelateInfoByStaffId" resultType="String">
         select department_id from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId}
 	</select>
 
+    <select id="getRelateByStaffIdAndDepartmentId" resultType="java.lang.String">
+        select department_id from lz_departments_staff_relate where is_delete=0 and staff_id = #{staffId} and department_id=#{departmentId}
+    </select>
+
     <update id="updateByStaffId">
-        update lz_departments_staff_relate set update_time=now(), department_id=#{departmentId} where is_delete=0 and staff_id = #{staffId}
+        update lz_departments_staff_relate set is_delete=0 and update_time=now(), department_id=#{departmentId} where is_delete=0 and staff_id = #{staffId}
     </update>
 
 </mapper>
diff --git a/target/classes/mapper/generator/StaffOccupationDao.xml b/target/classes/mapper/generator/StaffOccupationDao.xml
index 3b5ff56c..39209b41 100644
--- a/target/classes/mapper/generator/StaffOccupationDao.xml
+++ b/target/classes/mapper/generator/StaffOccupationDao.xml
@@ -37,7 +37,11 @@
     </select>
 
     <update id="updateStatusByStaffId">
-        update lz_staff_occupation set status=#{status} where is_delete=0 and staff_id = #{staffId}
+        update lz_staff_occupation set staff_status=#{status},resignation_time=null where is_delete=0 and staff_id = #{staffId}
+    </update>
+
+    <update id="updateAllOccupation">
+        update lz_staff_occupation set staff_status=1,resignation_time=now() where is_delete=0 and staff_status=0
     </update>
 
     <insert id="addStaffOccupationBatch">