From 086c8c208e6af4d593a80d8e6ea85013d8dd14cc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 10 三月 2026 09:04:25 +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 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 d76abcc..9a09742 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
@@ -91,13 +91,17 @@
@Override
public PageInfo<XpOpenCity> getPageList(OpenCityPageQuery query) {
- Page<XpOpenCity> page = lambdaQuery().like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getCityName, query.getCityName())
- .eq(Objects.nonNull(query.getStatus()), XpOpenCity::getStatus, query.getStatus())
- .orderByDesc(XpOpenCity::getCreateTime)
- .page(new Page<>(query.getPageNum(), query.getPageSize()));
- PageInfo<XpOpenCity> pageInfo = new PageInfo<>();
- pageInfo.setRecords(page.getRecords());
- pageInfo.setTotal(page.getTotal());
+ LambdaQueryWrapper<XpOpenCity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getCityName())) {
+ lambdaQueryWrapper.or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getProvinceName, query.getCityName()))
+ .or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getCityName, query.getCityName()))
+ .or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getDistrictName, query.getCityName()));
+ }
+ if (Objects.nonNull(query.getStatus())) {
+ lambdaQueryWrapper.eq(XpOpenCity::getStatus, query.getStatus());
+ }
+ lambdaQueryWrapper.orderByDesc(XpOpenCity::getCreateTime);
+ PageInfo<XpOpenCity> pageInfo = page(new PageInfo<>(query.getPageNum(), query.getPageSize()), lambdaQueryWrapper);
return pageInfo;
}
--
Gitblit v1.7.1