From a4d696725ae8e44a5c3dcade4ea65ff3310092e9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 23 四月 2026 15:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
index 2742628..ef12d9b 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
@@ -210,6 +210,7 @@
if (xpPoint == null) {
throw new ServiceException("系统异常", I18nKeyConstant.SYSTEM_EXCEPTION);
}
+ pointAddDto.setStationSortNo(xpPoint.getStationSortNo());
xpPointService.validatePointNameUnique(pointAddDto.getPointName(), pointAddDto.getId());
BeanUtils.copyProperties(pointAddDto, xpPoint);
if (Integer.valueOf(2).equals(pointAddDto.getOperationStatus()) && Integer.valueOf(5).equals(pointAddDto.getVerificationStatus())) {
@@ -236,12 +237,10 @@
}
xpPoint.setFpElectronicAreaId(null);
+ Integer stationSortNo = xpPoint.getStationSortNo(); //点位在场站内排序
Long stationId = pointAddDto.getStationId();
- Integer stationSortNo = pointAddDto.getStationSortNo(); //点位在场站内排序
if(stationId != null && stationId > 0){
- if(stationSortNo == null){
- stationSortNo = 0;
- }
+ stationSortNo = 0;
}
// 使用 lambdaUpdate 确保 pointPictures 为 null 时也能将数据库字段清空
--
Gitblit v1.7.1