From 44b4ae2d74d72109b718d5ef4e43ef94529542ad Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 13 Oct 2026 12:55:15 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=A4=96=E5=BB=93=E5=B0=BA=E5=AF=B8=E6=97=B6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=20-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../service/impl/TransportVehicleServiceImpl.java | 15 +++++++++++++++
 .../wrapper/TransportVehicleWrapper.java          | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
index 467fb555..e28d7329 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
@@ -225,6 +225,11 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 		vehicle.setRoadTransportCertImage(trimToNull(vehicle.getRoadTransportCertImage()));
 		vehicle.setRegistrationImage(trimToNull(vehicle.getRegistrationImage()));
 		vehicle.setRemark(trimToNull(vehicle.getRemark()));
+		// BladeX 数字 null 常序列化为 -1；未填外廓尺寸/准牵引总质量不得落库占位值
+		vehicle.setOuterLength(normalizeOptionalInteger(vehicle.getOuterLength()));
+		vehicle.setOuterWidth(normalizeOptionalInteger(vehicle.getOuterWidth()));
+		vehicle.setOuterHeight(normalizeOptionalInteger(vehicle.getOuterHeight()));
+		vehicle.setTractionMassKg(normalizeOptionalInteger(vehicle.getTractionMassKg()));
 		if (vehicle.getCompulsoryScrapLongTerm() == null) {
 			vehicle.setCompulsoryScrapLongTerm(DEFAULT_FALSE);
 		}
@@ -352,6 +357,16 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 		return value == null ? 0L : value;
 	}
 
+	/**
+	 * 可选整型字段：null / -1 均视为未填写
+	 */
+	private Integer normalizeOptionalInteger(Integer value) {
+		if (value == null || value == -1) {
+			return null;
+		}
+		return value;
+	}
+
 	private String trimToEmpty(String value) {
 		return value == null ? "" : value.trim();
 	}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportVehicleWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportVehicleWrapper.java
index cf77a825..05e77a5b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportVehicleWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportVehicleWrapper.java
@@ -48,7 +48,19 @@ public class TransportVehicleWrapper extends BaseEntityWrapper<TransportVehicle,
 	public TransportVehicleVO entityVO(TransportVehicle vehicle) {
 		TransportVehicleVO vo = Objects.requireNonNull(BeanUtil.copyProperties(vehicle, TransportVehicleVO.class));
 		vo.setCreateUserName(UserCache.getUserRealName(vehicle.getCreateUser()));
+		// BladeX 数字 null 常序列化为 -1；详情展示时把未填尺寸还原为空
+		vo.setOuterLength(normalizeOptionalInteger(vo.getOuterLength()));
+		vo.setOuterWidth(normalizeOptionalInteger(vo.getOuterWidth()));
+		vo.setOuterHeight(normalizeOptionalInteger(vo.getOuterHeight()));
+		vo.setTractionMassKg(normalizeOptionalInteger(vo.getTractionMassKg()));
 		return vo;
 	}
 
+	private Integer normalizeOptionalInteger(Integer value) {
+		if (value == null || value == -1) {
+			return null;
+		}
+		return value;
+	}
+
 }