系统查询bug

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -60,10 +60,10 @@
             from
              f_fire_fighting_system
             where 1=1
-            <if test="equimentName != null and equimentName != '' ">
+            <if test="equimentName != null and  equimentName !='' and equimentName != 'null' ">
                 AND name like  CONCAT('%',#{equimentName},'%')
             </if>
-            <if test="equimentCode != null and equimentCode != '' ">
+            <if test="equimentCode != null and equimentCode !='' and equimentCode !='null' ">
                 AND code like CONCAT('%',#{equimentCode},'%')
             </if>
             <if test="construction != 'all' ">