系统查询修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java

@@ -73,6 +73,8 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         map.clear();
         map.put("dataList", dataList);
         map.put("count", count);
+        map.put("current", current);
+        map.put("pageSize", pageSize);
         return map;
     }
 

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'  ">
+            <if test="equimentName != null and equimentName != '' ">
                 AND name like  CONCAT('%',#{equimentName},'%')
             </if>
-            <if test="equimentCode != 'null'  ">
+            <if test="equimentCode != null and equimentCode != '' ">
                 AND code like CONCAT('%',#{equimentCode},'%')
             </if>
             <if test="construction != 'all' ">