From 2aa8fe3c4cb92c83ba886f0d08b76e98f0dc4de6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 26 四月 2026 10:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
index 31f4ced..97cd2d7 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -379,7 +379,11 @@
PageInfo<XpOperationsUserWithRoleVO> ret = operationUserClient.listByQueryIds(query).getData();
// 设置距离，然后排序
- ret.getRecords().forEach(e -> e.setDis(String.valueOf(disMap.get(e.getId()))));
+
+ if (ret == null || ret.getRecords() == null || ret.getRecords().isEmpty()) {
+ return R.ok();
+ }
+ ret.getRecords().forEach(e -> e.setDis(disMap.get(e.getId())));
List<XpOperationsUserWithRoleVO> sorted = ret.getRecords().stream().sorted(Comparator.comparing(XpOperationsUserWithRoleVO::getDis)).collect(Collectors.toList());
ret.setRecords(sorted);
return R.ok(ret);
--
Gitblit v1.7.1