bug

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

@@ -30,10 +30,10 @@
             f_fire_fighting_system as sys
             left join wl_warehouse_structure wws on wws.id = sys.contro_box_build
             where 1=1
-            <if test="equimentName != null and  equimentName !='' ">
+            <if test="equimentName != null and  equimentName !='' and equimentName !='null' ">
                 AND sys.NAME like  CONCAT('%',#{equimentName},'%')
             </if>
-            <if test="equimentCode != null and equimentCode !='' ">
+            <if test="equimentCode != null and equimentCode !='' and equimentCode !='null' ">
                 AND sys.CODE like CONCAT('%',#{equimentCode},'%')
             </if>
             <if test="nameOrCode != null and nameOrCode != ''">