From a2510f90c763e9c5efb6e6539c6950821aada3e9 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Mon, 18 May 2020 10:24:40 +0800
Subject: [PATCH] update code

---
 .idea/workspace.xml                           |  63 +++---------------
 .../java/com/lz/modules/app/Dto/StaffDto.java |   2 +-
 .../app/controller/StaffController.java       |  22 +++---
 .../resources/mapper/generator/StaffDao.xml   |   4 +-
 .../com/lz/modules/app/Dto/StaffDto.class     | Bin 4006 -> 4006 bytes
 .../app/controller/StaffController.class      | Bin 6274 -> 6303 bytes
 target/classes/mapper/generator/StaffDao.xml  |   4 +-
 7 files changed, 26 insertions(+), 69 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8715e8b2..181ed036 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,55 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/enums/GenderEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffEducationDao.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/dao/StaffProjectExperienceDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffEducationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffEducationService.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/StaffProjectExperienceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.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/app/service/impl/StaffProjectExperienceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffProjectExperienceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.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$/src/main/resources/mapper/generator/StaffEducationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffEducationDao.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$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/swagger/index.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/swagger/index.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.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/app/dao/StaffDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffDao.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" afterDir="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/static/swagger/index.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/swagger/index.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest.class" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -114,7 +72,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.FumeiaiTest.contextLoads">
+  <component name="RunManager" selected="Spring Boot.LinziApplication">
     <configuration name="FeishuBusiness.getFeishuDepartmentsIntoData" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="lz_management" />
       <extension name="coverage">
@@ -178,8 +136,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.FumeiaiTest.contextLoads" />
         <item itemvalue="Spring Boot.LinziApplication" />
+        <item itemvalue="JUnit.FumeiaiTest.contextLoads" />
         <item itemvalue="JUnit.RedisTest.contextLoads" />
         <item itemvalue="JUnit.FeishuBusiness.getFeishuDepartmentsIntoData" />
       </list>
@@ -198,7 +156,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="52262000" />
+      <workItem from="1588936950753" duration="54299000" />
     </task>
     <servers />
   </component>
@@ -231,11 +189,6 @@
           <line>190</line>
           <option name="timeStamp" value="43" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java</url>
-          <line>168</line>
-          <option name="timeStamp" value="46" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java</url>
           <line>53</line>
@@ -252,9 +205,9 @@
           <option name="timeStamp" value="51" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java</url>
-          <line>85</line>
-          <option name="timeStamp" value="54" />
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
+          <line>102</line>
+          <option name="timeStamp" value="55" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/src/main/java/com/lz/modules/app/Dto/StaffDto.java b/src/main/java/com/lz/modules/app/Dto/StaffDto.java
index ae710f30..dada3699 100644
--- a/src/main/java/com/lz/modules/app/Dto/StaffDto.java
+++ b/src/main/java/com/lz/modules/app/Dto/StaffDto.java
@@ -35,7 +35,7 @@ public class StaffDto implements Serializable {
     /**
      * 人员状态【1：离职；0：在职】
      */
-    private Integer staffStatus;
+    private String staffStatus;
     /**
      * 是否是部门负责人
      */
diff --git a/src/main/java/com/lz/modules/app/controller/StaffController.java b/src/main/java/com/lz/modules/app/controller/StaffController.java
index e7b7c36c..3a5bc3e0 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffController.java
@@ -51,7 +51,7 @@ public class StaffController {
      */
     @RequestMapping("/list")
 //    @RequiresPermissions("staff:info:list")
-    public R list(@RequestParam String jsonString) {
+    public R list(@RequestParam Map<String, Object> params) {
         //当前页
         int currentPage = 0;
         //默认每页返回数量
@@ -63,8 +63,6 @@ public class StaffController {
         //人员状态【1：离职；0：在职】
         Integer staffStatus = 0;
 
-        Map<String, Object> params = JSON.parseObject(jsonString, Map.class);
-
         if (params.containsKey("page")) {
             currentPage = Integer.parseInt(params.get("page").toString());
         }
@@ -99,18 +97,24 @@ public class StaffController {
      * 信息
      */
     @RequestMapping("/query/{staffId}")
-    @RequiresPermissions("staff:info:query")
+//    @RequiresPermissions("staff:info:query")
     public R info(@PathVariable("staffId") Long id) {
-        StaffEntity staff = staffService.getById(id);
+//        StaffEntity staff = staffService.getById(id);
         Map data = new HashMap();
         data.put("staffId", id);
         StaffBaseInfoDto staffBaseInfoDto = staffService.getBaseInfo(id);
         StaffEducationInfoDto staffEducationInfoDto = staffEducationService.getInfoByStaffId(id);
         StaffOccupationInfoDto staffOccupationInfoDto = staffOccupationService.getOccupationByStaffId(id);
-        List<StaffProjectExperienceDto> staffProjectExperiences = staffProjectExperienceService.getProjectInfoByStaffId(id);
-        List<StaffWorkTransferDto> staffWorkTransfers = staffWorkTransferRecordService.getWorkInfoByStaffId(id);
-        staffOccupationInfoDto.setProjectExperiences(staffProjectExperiences);
-        staffOccupationInfoDto.setWorkTransfers(staffWorkTransfers);
+        if (staffOccupationInfoDto != null) {
+            List<StaffProjectExperienceDto> staffProjectExperiences = staffProjectExperienceService.getProjectInfoByStaffId(id);
+            if (staffProjectExperiences.size() > 0) {
+                staffOccupationInfoDto.setProjectExperiences(staffProjectExperiences);
+            }
+            List<StaffWorkTransferDto> staffWorkTransfers = staffWorkTransferRecordService.getWorkInfoByStaffId(id);
+            if (staffWorkTransfers.size() > 0) {
+                staffOccupationInfoDto.setWorkTransfers(staffWorkTransfers);
+            }
+        }
         data.put("baseInfo", staffBaseInfoDto);
         data.put("educationInfo", staffEducationInfoDto);
         data.put("occupationInfo", staffOccupationInfoDto);
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index db3b1550..5c27ce2e 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -99,8 +99,8 @@
 
     <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 staffStatus,
-        if(ls.employee_id=ld.leader_employee_id,1,0) departmentLeader
+        case lso.staff_status when 0 then '在职' else '离职' end staff_status,
+        if(ls.employee_id=ld.leader_employee_id,1,0) department_leader
         from lz_staff ls,lz_staff_occupation lso,lz_departments_staff_relate dsr,lz_departments ld
         where lso.staff_id=ls.id and ls.is_delete=0 and dsr.staff_id = ls.id and ld.department_id=dsr.department_id
         and lso.staff_status=#{staffStatus}
diff --git a/target/classes/com/lz/modules/app/Dto/StaffDto.class b/target/classes/com/lz/modules/app/Dto/StaffDto.class
index 525399753f5d803e3863137a158aec091690bb2e..61391d4257bf7e550b2f8669b6ee2120f46b2852 100644
GIT binary patch
delta 204
zcmZ1`zf69EEaPNjMqx(b$rqV~C%Z7-loU=+EpbULNGvMJP0cIuNli>iEn;L4)zAd1
z@MLNe5iZ75G5IW$^yYs|FB#c1co=jTbSJ-MabdIIVX$Ga-E7X9#>lC`z`(!+lG(hB
z&5DuHV)8?FD`uc9kQUx-$Wh8TiBoj)Zcc3x4F*OA2cTkBMh0yL0U*bX!F@6#r^sYJ
XE=@k5euT8nW>+qGRz}gusr-%rch@n+

delta 189
zcmZ1`zf69EEaPMYMlnHwl+=R6qLSRyyb_<(#FW&c$u5jHCmS<KFbStmzQ`mp*_)|_
zNlat1A)_#pX4vGjOcI;_F}-AD)8S#zWzd=Ymc@n5hKIqH!Dh2LYZ@b`4g&)N6G&$B
zGBztlMw`hG*{zs?vOrpRvmr+*Bct17Moy8*yE(N*bQl;J9DwRs85y)01b`fO28bjd
XmnI+32!yomW>+qGRz|VOsr-%rbqy*b

diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index 299ed590c3926f4f2652277ae719c47f9c493b18..76b8698bd6fd887567914cbf1260ab869a6baa82 100644
GIT binary patch
delta 2432
zcmbVNd0bRg6#m}Kyt$8=2MkX{N5M4{WN^fCo6r^uMZi4~wPpH&h@m0_m|K%tnO17N
ztjtndwbcbf(6l|vqO{etJ=-*wR{f)2_T4uFnEF@0nYs7ebKW`UyWe;3n}wNcGsAoS
z*}e<F#W>}HA2k|G7w*MM4fnZmKOT_7Dj9iDx>sw+(J)Lyo`(Dw^u$AMJd8DRSnI+%
zJR<O@3ki5kE*=+n!i7XxbDk{oq<n0>%-Z0_Q+Qfh&x~{9Sv)83ybCF)k*<wyY{F(Y
zwxCw}wo2a%Zq#9$T-Ix7(6C*@4h>Uf!58JQ(}i7lNm?%pydv=G=KZBMPiku3)L?bc
zUsYLJ=Fbn7o5$7mZJp)8ir}=6g7~w7%j`bIF!$<-=5~Af7Dv32!9uSIye{yD0#AN%
z<&+skBV}@NWpM=y#EdB|nI5dHswh@4Jk_jm^f6DU?aWLi$(*Dmn&Z_ywPT$tlx_lV
z3hWkmi@Owfo3;EitBNaT`{#x#gOexc6wO!A*YvAtX1P{mc6DYtReva0U2L8dS+xhX
zTqQdT0~LTcbnL-93LNFZl463>@h%#5yodL7?8QDEAK*hBy^tyJk&ch?iH=XPU*Izx
z2XN3_;Oa6s3!m%w0$(afXyImPFf@hy$iP=RzQ#8?&qE)9Z*_c!Lpu7RpTPGze!!0k
zGR#q)R%XZe7&FV0;M36`0|b83@iPu{cRG&X7ad1&Oh*8h2prdO0*7_{ieqL!ch9!-
zCF0-EDDb<EKk%oHzi_gt>I%0%F17`i)NH3a&4{yHWx?qs{=6B}OB8gEVo0<r@HOMv
z>+~cjh&*g*o>v;GG!MDE)lSphw%Uzx?QL#HsB{kXvZtoyn7IkPlmX1{WFGPKHs>ZR
z5BKCj2UOT3iBQm+D<|iRINKyA=lDp?IX*ISj*ncN<&$+OEXP5t?&qwSON_YirO}>1
zCtOBbXGCJU99M8wFc?>I#T?}nvAO9xU?1pl4Ki#22Y;%)9`=AU-EcHOwP6(u%XHd!
zgG4>Ff$2s}ON3@~WKg={YCzaZ@>q5x6mX;)?q~}AG^2hs-O!`{B+G0rWkKk%6|u=F
zUWZrpIvWt@L_kPalOx`NzFIvzftVdgDD;ZfT1xUZ7~z1+8)G=Ut~#_T@WyQ7{v42;
zj6-XV{i#EM`_DoQIfx}gt;kCUvXX&pMu+e-45N{Y>o6QsF#@x=T8J@NiL0>z1!zDa
zUltS4h>5%%lPr$QBRoou!)!uIaTUucY_^{ThjLbVpK@r~*?1pY<Pugai{#N#31T<$
z+0e-rz1egmZ)*cOV-zzqwo4|6G0bda&R7C*aXUZ~>qdGNuva8AYdlj6>FxmaG&dy#
zCJ0Pa6oE<B_Zq<4rcDa2<uj^6oZwdF@w^_r&7+B_VR<yx5vNA)`W;9t+=kZqJ|ii;
z0d4FkkQ&fzYr}AwUYhMlse^WV+R3z4ueuxh4x})%LqKJuBO{#{aY`jSD_8@URJ9IW
z80^a61q=$Wkil>?D(cY9XIz*O>FP7OdwC)y0H2ZSRU;<lH`07mx<%$}{(S%?L_Y-v
zO8Ls4iZtBFt5-(hr%~t`<hPs@&E$?l^j4x8RhUnq7vm<>gfW}{19L20M@LAA-W}4x
zqNSu-!&;WjCTS^H%Hn0DD-AcZ{B+9N2Ni5mPFY7_Jll+<tYy5v6_%_`!bM`C=2&G^
zw{UmZPZOro60VBc2~-Qr5(J08kt{GfGBznVh5MB+nm7Ur@^`~TC?Rg3h(4Wf1<aMs
z5aw~3Pmm7lg)xNS<>`s10#eT&HWZM~P2d5xSr^7-#TW5t-)4~!Ic@RHWW@8)TUaxC
zkmSLaFxoM#1;zs2ohC?&EJ#8^x|I(qta~0bVGB-r6P*8|Sw=J~{y&=A&p@;IY&3UZ
ziR4D^V;J`!$uTT)>fviZ#`yuQBJHcs0Aw`NWAJ3$*+S1!mOGc8yUqY~cLY#c6F)XA
SV~!2WtvrL)3a(qIz2{%3#<ubR

delta 2422
zcmZ`(d7MpE9RHrT%)N8pne7e3WoD3sVLV%whq9J!7$lAT4v%?^nKAEC)`z5|P#2|5
zdr^u;V-SfpDp6_GMx;er|4e<)ePfy|pPA3O-}C#O^ZR|z_j}IU&~8b)*uir<_W<aK
zzYMg+N*${Vtj0YW?loXzjgGZGc(6_l_o)^4tMqyu19c42F<3`lA_928hX?VH8Xh+A
z2sUVV)Id5OQ<KM4_z4Y9YIw>(ebr;0D)+RC7d)f3KkLIrY*OesAD+i%g<kOCMQl-M
zs}C=s!oW7XtcFS*+jUgw*rB6X)!3<qT?SskZiV(}cvZvRtw+Ny(aO$Gs$=K7&17R*
zq_kv2v^-ogRlskzWq7H(rM=JH$_~35R-AFCh{oLZnudKmyFhAQC|XoHIo~R`W`v@l
z@`ykeyNTY?9+#-u8@>DO&3gNa;)K;AoofR#XNAh=1m;De)|4p&CNHp0>fO^)omntk
zGNm-=<n3&IwKov4W``;oCFY6oJ#dWx*id3WUKdE3X3e$&v!dbRK%P~m;SGs5@s@z6
z%$gdKcpC>K4&oh&ck!OYA-pfq4(&A@mN<eBBtFDP8jebQj86oz>|yRY_5s6}+5?|T
ze1^{@zQ8eoX7&-0ZZFdP69m%!>)79l6tSyX`K82H_*&v>bkgvR#J4yu(HUJdoRIhq
zCndTfsNs~v_c$%l4c#^TAn_wkYxqgxXPlAv1!wFsUz_^#73s4$py5}E-|)M{ANW%s
z*CEls-M~KKt844BxxGm?ZEa2}oe{8#!-ZC%6_{d0qRO+tz!5`-2>8mZ@<?cC;k3}C
zs6giy_DWBdw@<MZiP(Q9*Q+=r4Od5PYAD)!&Vb1RIV}b|M+=t*Muf`4tU1>zEDm*R
z84nj*B~t_OS`|l=vt6Pq`82kNrnMKjb}yM}hf>q*bE$3Z#c8Wz0p5DR3zt$G0v$L@
z;I|{cE+x`MF=};DjFMdxqjDF-R9#*Rj@Pn!fM3x|HP6`&vDN9<lcQP%G=@q^2Yb;Q
zeK-^7i++4t-0jNdI?32s`>;PFRt4`~c!HX#`4e_Pb74Kw<5+j05{XqXdT{Qml_Rdn
zUBjHL&ZWh1JQwtEmQ*W4T%GYUlU$vN)r(JR3Rb}#Ovu@Wl*}yCV|q=JN=-meSE2KP
zG!HtFm_KOjLVAIz*G<gI+>SaypK16LOkXAHjxvocJfa6ZIgUmK$1XG_NV~ctkwPXh
zlTLAB*;FQn+62)b*I@u|#9$O64`s;5d<?^#xB=@h5}PmzyHUXBHHHsrERJIwZ}fOa
z>$!0~tF@-GtaLp!ci{}H4&c|zS1^#s&E}^th*=LQ9LL}op_fdKvE>jNlg%ePl&v*3
zYtQz>p|fQZjNs-(HqIoSkubP5iBw0yhnsk|47P~xEU4KznmflZ*96{wcsgCfSPkQZ
z;Nbj^*DwJ{YiOE{Fp=xLf~<iK_R%^mV!S6}g2NVAtE6wW0~s#tMZLUTs9&%h=8#-}
z0|pzqF{(PBNqs%USqx_rdx;wnHzrn&HX*)(SR-yqd?m4NCYV|!n(?Do;;LMKbJN43
zF;>m>w=li&2D$#0>K>?GblsnmONW)cZpYprl8K8rhAG4}-v8-njba);gWi@<%u@PQ
zhDn&oY&m8jf<=g81(A9wV<{|8S>xVX6vbFdu;A_7FrC_FAjX3EY}lHa87%5y`Ee{<
zM)&&Cr<p9Az!m*id^kNA%iqGN<KB6H;<;Hhx!Lq*A{$fpB7W4bM+3I9*tjq@1|ou+
zaf_Nbcn&6Wf#kc#TosI99zXN3ApWR%i(LEzQYfx6tCh>qN~z>>R5G0OLSC3f&Z*Uv
z;qsbOr#MFyaY`}4*#(>&8VhStiaC@tMQITi3oO1Yo7R_Rvz%;JT#8MM#FX;YbS}qc
zNi8<FUdU!CZmZU2AdjjJ>vy!NLhcT<xiq0Q^n4u&MdDA2TWa+2V;QeQ4WVV1l;@6G
bgqHuGkc+=0%8M0_(|)46ICtE3l)d|3ut&R;

diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index db3b1550..5c27ce2e 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -99,8 +99,8 @@
 
     <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 staffStatus,
-        if(ls.employee_id=ld.leader_employee_id,1,0) departmentLeader
+        case lso.staff_status when 0 then '在职' else '离职' end staff_status,
+        if(ls.employee_id=ld.leader_employee_id,1,0) department_leader
         from lz_staff ls,lz_staff_occupation lso,lz_departments_staff_relate dsr,lz_departments ld
         where lso.staff_id=ls.id and ls.is_delete=0 and dsr.staff_id = ls.id and ld.department_id=dsr.department_id
         and lso.staff_status=#{staffStatus}