bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentSpecificController.java

@@ -96,7 +96,7 @@ public class EquipmentSpecificController  extends BaseController{
             @RequestParam(value = "pageSize",required = false) int pageSize,
             @RequestParam(value = "equipmentId",required = false) String  equipmentId ) {
         Long aLong = null;
-        if (equipmentId != null && !"".equals(equipmentId.trim())){
+        if (!"null".equals(equipmentId) && equipmentId != null && !"".equals(equipmentId.trim())){
              aLong = Long.valueOf(equipmentId);
         }
         return  CommonResponseUtil.success(equipmentSpecificService.getEquipmentBySpeV2(name, pageNumber, pageSize,aLong));