修改bug

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

@@ -29,10 +29,13 @@
         <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.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
-        <if
-                test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
+        <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>
         ORDER BY a.rec_date desc limit #{pageNum},#{pageSize}
     </select>

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2367,4 +2367,16 @@
             UPDATE `f_fire_fighting_system` SET `analysis_index_key`='FireAlarm,Fault,Shield,State' WHERE (`code`='029026401813010000000054');
         </sql>
     </changeSet>
+
+
+
+    <changeSet author="tw" id="20220120-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_equipment_category"/>
+        </preConditions>
+        <comment>wl_equipment_category 更新消火栓</comment>
+        <sql>
+            REPLACE INTO `wl_equipment_category`(`id`, `parent_id`, `code`, `name`, `is_consumptive`, `description`, `remark`, `create_date`, `industry_code`) VALUES (1438772584828137473, '1438771726480601090', '93060400', '消火栓', 0, NULL, NULL, '2021-09-17 15:51:30', '2');
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file