From dc48f9978d3bac9d0336b85abc9a473c1a10a789 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Mon, 18 May 2020 16:25:23 +0800
Subject: [PATCH] fix bug

---
 .idea/workspace.xml                           |   6 +++---
 .../app/service/impl/StaffServiceImpl.java    |   2 +-
 .../resources/mapper/generator/StaffDao.xml   |   2 +-
 .../app/controller/StaffController.class      | Bin 6279 -> 6662 bytes
 .../app/service/impl/StaffServiceImpl.class   | Bin 6411 -> 6413 bytes
 target/classes/mapper/generator/StaffDao.xml  |   4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b0457764..c61fac52 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,10 @@
   <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/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/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/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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -154,7 +154,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="62186000" />
+      <workItem from="1588936950753" duration="62703000" />
     </task>
     <servers />
   </component>
diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
index 403fbec7..fe0657e0 100644
--- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
@@ -81,7 +81,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
         if (intoStaffStatus == 1) {
             staffStatus = intoStaffStatus;
         }
-        List<StaffDto> staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, currentPage * limit);
+        List<StaffDto> staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, (currentPage - 1) * limit);
 
         return staffInfos;
     }
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 0be3b68e..33c85b8d 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -122,7 +122,7 @@
             and dsr.department_id=#{departmentId}
         </if>
         <if test="name != null and name != ''">
-            and dsr.name=#{name}
+            and ls.name=#{name}
         </if>
     </select>
 
diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index d752860b2dc338868b67d6bd19abdfe05bbe0f75..8756a764556efd696071a949b292e769c0ea54a6 100644
GIT binary patch
delta 1999
zcma)+cXSk06vlru+07evCk7S+2aj;Xe-r{l6f6<Jg7id1kRVt#5Fi)>nt%;i5d;JQ
zbrl5#8zRL527w@g9YtfohS+;SMa6=s;P+-XA+&Qm$-KGmzIX5a?svc0DeWhBNNn7-
zW*yLhe<S2E+vAQ1cQVIgZj`&Y+b;9$$$aa+$D^l5FONPR1r2D&y;1Jte!DynVF3>s
z7Di~qLw2*susFh@Hs?5-W{JJF)J8oV<q;mW)?@vmEMvJfACFSSiYQO8GQuiWTVHjQ
zH9TpzYdxOwSm&|cqs(KxN5ZCi+AhyTc$Vj^^}OK)!;8ynjtWI&Y%siJc)4m<Xos7%
z(eR4lRYQ&8wPc1@)IM5K8Lup@s4N{4FLP*6Tr#}0ylcF&#KDx54^3HqUcF0I1HGu*
ztrMp>pu9e>^M*rcbbNS;iut_BCZD%>+vgqL^?8rYKF84B@V?I$KJfXFj|?CCe8Q*6
zC6OZ&o%qb>bG~qBG%`Lmo;Rklv@EYjykbN_e6&6I(&sC__BEZ3hHren<vX9_Il=I~
z&sKi$IgyhLKl=Q{HnrvRGry=qpI_PTlh4V9-+X>&o6jF?ckqhi6(v2(hmCT`DjAyW
z9c_^_!GiviO@<vlf3ef&Z~mzoADxkzXs5YD7}s`z!?D_B>V2Hvt_8K9PuTYJ3F3Y}
zA=}4iv=_5lJ1cvh-cCnby!9%a<w3nJT5WYWf>X8nfgR>FPS?)i47v(y=j8g>R;NpH
zY2!f&duudNty|K!taT>cblYV!-RYrsSkvk$D}x4_U@v+TB8wXO$O_Y#4HQtQ%8S(h
zS)8rOSJRSn6d^%!IDI)+ku{3xM}H!mr+Q74mqbu(fQqF;ixfIghb;*2rY**BzG0B#
z7zPLb7eKS7O`CI}?t~rTgp2gJTpTceh!Vy16c56wU<gBXW<(PuG8~36T);)1GefO-
z@+Ct#3&h0YobCY=edX+?k7|T^$W(kIN`r1-ejPjW8ObF|<}sTx-F9it1TLjqDO)jy
zQQ|YCxtDSomy4a+UQ>B1>he~mTWyKEn*k(Jy^c}4hOve#3|AVif}P?o-R?*swgTI`
z&8vepecR?WdWtI;r`NTqQLERGAZ9A6DCQQ#+`^cfAIgnIstLQyAv-WLT@ouX1-Y@K
z_xNSXFLz;XtX10GFfdc@{LpF|=7*bwmnnG&tG#xCk|v3X$tpQjlb%Kn)1`%(v|*M$
z#apGpq&S@`9n1?f+BpR-QAco5T7DV2Vx?x$_hr1S3?(d-W~}`BYiDJZA~+><8)>y<
z71WT7U9_y#&EO_YYe_taW)f-9T(_@iCUAX9H2M}?{Xur?6=daB)7oW#D6s9jLHm*5
zc%evG6tosdob0;JvYE&v;Y*Kmq5|zW4^vn?VMiCp_6CtxYfssOW~y#F+;~tlxd%qG
zTxhEP2bzSi)q_)qU|Kyi)AvPl6Eo7>^imI&n^?fjYT8uO_P~JFO1|sr0g9#Qv7c&8
mGMS~yX?|uN5YWx_0Nt`TAXoCTvq%QC#$?^5{hl9$+y4WA-$Y^n

delta 1622
zcmbW0c~DhV9LGQB#^c;~??GcRsR<`%nn_V3OIl3IHUUj5E466xnJAJe^#n_^Cq`-u
zS=}<Ty{v4PummgGEX$-a)6`bY7Bkxy$7ZtMxsL%7{%Ypk-}#+$e#`g!{hc>=z`Xv6
zHUF$^0tWDxM?Y?Hxz*z~0+-u;?qH!cciNjp_V_NBLYE?!p)SLs^kuQn-P~i%y&m^*
zzvcmtbRM*uhcpj+WZ9ZCY?&oC>=B#wsLx|8wcg_+e4gM*>ptc4G|%`v%QBBTp0j85
zKFfLDZeMU&;nLvJ=u&PAt+eJvkC%AadQF;FG_TgJKP<%)=QYjinm6iGBD<ZmRhl<7
zZ)sL*-VUPfm}p8oR#mDP+$)%^vVy<e%=%UCW>q|p;}uAr;T_f}QYvB-OQo3MUDg_!
zdC%}Z9~jp0q2X}yH0uo?vB9vBk2RYNo7tks3ARSFf<2y}7|17vPx(xdULLE8<yB6b
zG&!#*7B3qftFRZJ8@}L6!;u`N*=pFvS4L)$ui0++nr{q8bByL&!*}cu^oH-*DMSoE
zu*+~P$7y~v{KO8!&+JmT<6`mB;wclRD$+{F2Q_|=?3ot(FRa!4YWR)c4S(>bqF+$0
zGV7cD>8XjnGGB<`SWYO8kX@>*{bhA5whm_kvBQ}l?QkXl_c^n5MQ5>tq`K{<@@@0n
z6{xzfUx8Q~1&45gSQGjYPGqp`6en@AU>y|f&e*96g6)|l2^&>`FLp~yl=V*GREc)j
z#AytXHNpl8#oLdl46uk|Qb?1b4izs#CaW37>C$<rFdohbc?XU3<P6DhY2skc<SfZ-
zmYk8CjmJ6C?*OSwB5Zc9G)tzAlGM?1*@MVlQC4flXwFkgbAI?MfdjjD&*1`zi73Gd
z7s}^wQK)<uDRi-XV@ptRVvLhJEi!S5IEwL<3UCom)e03?&Vqt&OGJrn-3mh`M#|w3
zndAiFkSa;(Obpo||H-6=)+=L@6mwZfx#;AOLp7H&SxWY%lFOJPP4XpXswf+2<(jN}
zd28J(TB!EK*(;n!CAr3hu4bC1Qd6aw4tqqu7P@7E*gmlT(!4UHX)MjF<Qp4jhAcC=
z+HwunWoIUOIgD;#|7DWuVBd&mwP%jZy(WAo;VkId%CRf6xJHV!^qnQaw(mib)+TR)
z*|uFMb#<H6b0ko4ZL+=ig#;V3yCiydj-ggCEcpKzYT9AAZeI*@nU@^5ywijeQqIU-
zPFkM^avSN>IiN+N?&5ZUGFnB+U_RHki88-aQEq4l=*D({4wYz!n?hR~ikTt%n`Pf7
H=z@O%VNDHD

diff --git a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class
index 4b45aeaed59dc99d30bc9ac9302d7d8d6e215772..8440cc57222a0f94d2282ea99a835a2b6836ae46 100644
GIT binary patch
delta 161
zcmeA+>NVQHC&qb(ft`Vafq_A1vbdNW6HCfuQ!&kYO@=TA7ocDeM2f+c!41d*Dq<*R
zC}Cg(vr2(1CNQgvA&-F>%qjq~Sir1uh6)B&1~vvYhDsodjX@KrqKY9JXqhiio(E_K
eM5G!hk_;5#U|{^iAk5BC!w|s0u=%c-9uoivMioE+

delta 158
zcmeA*>NeWIC&qb-ft`Vafq_A5vbdPsWOFgidUb{{1{a`65Ja58mB9_j1FB#sW+-7`
z1hYzkEG96kj3JMK8O$mGvRJ^Za)t^9Rt7c(6^2S6i;Y1YsG^D?8fcR*P@V^921KM9
bD3S~m;b36=!ywGgP{R<wz_9tgm>v@Vx~3Gu

diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index 5c27ce2e..33c85b8d 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -108,7 +108,7 @@
             and dsr.department_id=#{departmentId}
         </if>
         <if test="name != null and name != ''">
-            and dsr.name=#{name}
+            and ls.name=#{name}
         </if>
         limit  #{startIndex}, #{pageLimit}
     </select>
@@ -122,7 +122,7 @@
             and dsr.department_id=#{departmentId}
         </if>
         <if test="name != null and name != ''">
-            and dsr.name=#{name}
+            and ls.name=#{name}
         </if>
     </select>