运输记录查询条件别名未设置

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/service/VehicleDriverUserServiceImpl.java

@@ -69,6 +69,9 @@ public class VehicleDriverUserServiceImpl implements VehicleDriverUserService {
     @Override
     public Page<KObject> pageByVehicleId(Integer pageNo, Integer pageSize, Integer status, UUID vehicleId, Date startDate, Date endDate, Boolean isOrderByPlanCycleType, UUID driverUserId) {
         Page<KObject> kObjectPage = vehicleDispatchDao.pageByVehicleId(pageNo, pageSize, status, vehicleId, startDate, endDate, isOrderByPlanCycleType, driverUserId);
+        if(kObjectPage==null){
+            return null;
+        }
         List<KObject> datas = kObjectPage.getDatas();
         List<KObject> datas1 = removeFiled(datas);
         kObjectPage.setDatas(datas1);
@@ -101,8 +104,8 @@ public class VehicleDriverUserServiceImpl implements VehicleDriverUserService {
             KObject dinasType = base.get("dinasType");
             if(null!=dinasType&&!dinasType.isNull()){
                 KObject dinasTypeCopy = Amino.getStaticMetadataContext().getBean(dinasType.getType().getName(), KClass.class).newInstance();
-                dinasTypeCopy.set("dinasTypeName",dinasTypeCopy.getString("dinasTypeName"));
-                dinasTypeCopy.set("id",dinasTypeCopy.getUuid(BaseConstants.ID));
+                dinasTypeCopy.set("dinasTypeName",dinasType.getString("dinasTypeName"));
+                dinasTypeCopy.set("id",dinasType.getUuid(BaseConstants.ID));
                 base.set("dinasType",dinasTypeCopy);
             }else{
                 base.setNull("dinasType");