From 11eed02309307bd19df2e0a67a2abe3b05d9b75b Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 26 Nov 2020 18:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/generator/StaffDao.xml   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 546fa963..2221ceb7 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -265,6 +265,7 @@
             <if test="name != null and name != ''">
                 and staff.name like concat('%',#{name},'%')
             </if>
+            group by staff.id
         ) 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}
@@ -274,17 +275,18 @@
         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 staff.name like concat('%',#{name},'%')
-        </if>
+            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>
+            group by staff.id
         ) 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
+        where occ.is_delete=0 and occ.staff_status=#{staffStatus}
     </select>
 
     <select id="getBaseInfo" resultType="com.lz.modules.app.dto.StaffBaseInfoDto">