From 742a8b64b9e10b08ac2da97a4257d287a22e8d2c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 三月 2026 18:42:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 ae5f333..07a4bd8 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
@@ -174,12 +174,13 @@
.eq(XpOpenCity::getDistrictCode, districtCode));
if (Objects.isNull(xpOpenCity)) {
xpOpenCity = this.baseMapper.selectOne(new LambdaQueryWrapper<XpOpenCity>()
- .eq(XpOpenCity::getCityCode, cityCode).isNull(XpOpenCity::getDistrictCode));
+ .eq(XpOpenCity::getCityCode, cityCode).eq(XpOpenCity::getDistrictCode, ""));
}
if (Objects.isNull(xpOpenCity)) {
xpOpenCity = this.baseMapper.selectOne(new LambdaQueryWrapper<XpOpenCity>()
.eq(XpOpenCity::getProvinceCode, provinceCode)
- .isNull(XpOpenCity::getCityCode).isNull(XpOpenCity::getDistrictCode));
+ .eq(XpOpenCity::getCityCode, "")
+ .eq(XpOpenCity::getDistrictCode, ""));
}
return xpOpenCity;
}
--
Gitblit v1.7.1