Merge remote-tracking branch 'origin/dev' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -176,11 +176,17 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        Query query = new Query(vehicleBookRecordQueryVo);
-        PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         if(vehicleBookRecordQueryVo.getStatus() == 2) {
-            removeStatus2(pageDataVO.getData());
+            Query query2 = new Query(vehicleBookRecordQueryVo);
+            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query2.getSuper());
+            removeStatus2(list);
+            PageHelper.startPage(pageNo, pageSize);
+            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
+            return RestResponse.suc(PageDataVO.pageInfo(vehicleBookRecordVoPageInfo));
         }
+        Query query = new Query(vehicleBookRecordQueryVo);
+        PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
@@ -188,7 +194,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
    public void removeStatus2(List<VehicleBookRecordVo> list) {
        Iterator<VehicleBookRecordVo> iterator = list.iterator();
        while (iterator.hasNext()) {
-           if(iterator.next().getVehicleDepartureLogVo() == null) {
+           if(iterator.next().getVehicleDepartureLogVo() != null) {
                iterator.remove();
            }
        }