Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -120,7 +120,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         ScmVehiclePatrolinspectionQuery query = pq.getParams();
         QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
         qw.eq("createOrgSid", query.getCreateOrgSid());
-        qw.eq("isDelete",0);
+        qw.eq("isDelete", 0);
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("vinNo", query.getVinNo());
         }
@@ -141,7 +141,9 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
                 record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
             }
             BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
-            record.setModel(vehicleVo.getModelName());
+            if (vehicleVo != null) {
+                record.setModel(vehicleVo.getModelName());
+            }
             String locationSid = record.getLocationSid();
             ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
             record.setLiableSid(scmWarehouse.getLibTubeSid());