1.处理车辆设备状态信息不展示问题。

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1415,7 +1415,7 @@ public class CarController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getCarEquipStateInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "车辆统计-获取设备状态信息", notes = "车辆统计-获取设备状态信息")
-    public Page<CarEquipStateInfoDto> getCarEquipStateInfo(@RequestParam(required = false) String keyWord,@RequestParam String flag) {
+    public Page<CarEquipStateInfoDto> getCarEquipStateInfo(@RequestParam(required = false) String keyWord) {
         return iCarService.getCarEquipStateInfo(keyWord);
     }
 

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

@@ -1488,10 +1488,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
         Page<CarEquipStateInfoDto> page = new Page<>();
         List<CarEquipStateInfoDto> result = new ArrayList<>();
         List<Car> list = this.list();
-        if (StringUtils.isNotEmpty(keyWord)) {
+        if ((!ObjectUtils.isEmpty(keyWord))&&StringUtils.isNotEmpty(keyWord)) {
             list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
         }
-        list = list.stream().sorted(Comparator.comparing(Car::getExtra2, Comparator.comparingDouble(Double::valueOf)).reversed()).collect(Collectors.toList());
+        list = list.stream().filter(car->!ObjectUtils.isEmpty(car.getExtra2())).sorted(Comparator.comparing(Car::getExtra2, Comparator.comparingDouble(Double::valueOf)).reversed()).collect(Collectors.toList());
         for (int i = 0; i < list.size(); i++) {
             Car car = list.get(i);
             CarEquipStateInfoDto carEquipStateInfoDto = new CarEquipStateInfoDto();