From 80f6c17c34dae2c5f9f861e274f4e8d5e2394d5c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 二月 2026 18:00:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
index 1ceef23..fd8b144 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
@@ -142,4 +142,18 @@
     public void upDown(Long id, Integer status) {
         lambdaUpdate().eq(XpOpenCity::getId, id).set(XpOpenCity::getStatus, status).update();
     }
+
+    @Override
+    public String getNameWithCityName(Integer cityId) {
+        String cityName = "";
+        XpOpenCity openCity = getById(cityId);
+        if (Objects.nonNull(openCity)) {
+            if (StringUtils.isNotBlank(openCity.getDistrictCode())) {
+                cityName = openCity.getCityName() + ">" + openCity.getDistrictName();
+            } else {
+                cityName = openCity.getCityName();
+            }
+        }
+        return cityName;
+    }
 }

--
Gitblit v1.7.1