修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -47,6 +47,34 @@
     <!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
+        cb_firefighters_post b on
+        a.sequence_nbr=b.firefighters_id where
+        a.is_delete=0
+        <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
+        <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
+        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
+        <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
+        <if test='par.address!=null'>and a.residence_detail_val like concat ('%',#{par.address},'%')</if>
+        <if test='par.state!=null'>and a.state_code= #{par.state}</if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+        <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
+        <if test='par.jobTitles!=null'>and a.job_title_code in
+            <foreach collection="par.jobTitles" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if
+                test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
+            =#{par.areasExpertiseCode}
+        </if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+
+
+        <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+<!--
+
+
+        select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
         <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
@@ -64,7 +92,7 @@
         </if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 
-        ORDER BY a.rec_date desc
+        ORDER BY a.rec_date desc-->
     </select>