From cf7fde24bf5a20ca8328729406f85ee16984da7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 14 三月 2026 21:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
index d01cf2d..ef38af1 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -150,17 +150,17 @@
// 7. 查询是否上班中
try {
- R<Boolean> workStatusResult = xpClockInClient.checkWorkStatus(userId);
+ R<Integer> workStatusResult = xpClockInClient.checkWorkStatus(userId);
if (workStatusResult != null && workStatusResult.getCode() == 200) {
vo.setWorkFlag(workStatusResult.getData());
} else {
// 调用失败,默认 false
- vo.setWorkFlag(false);
+ vo.setWorkFlag(1);
log.warn("查询用户上班状态失败, userId={}, result={}", userId, workStatusResult);
}
} catch (Exception e) {
// 异常情况,默认 false
- vo.setWorkFlag(false);
+ vo.setWorkFlag(1);
log.error("查询用户上班状态异常, userId={}", userId, e);
}
@@ -491,6 +491,6 @@
if (StringUtils.isBlank(phoneNumber)) {
return Collections.emptyList();
}
- return lambdaQuery().eq(XpOperationsUser::getPhoneNumber, phoneNumber).list();
+ return lambdaQuery().like(XpOperationsUser::getPhoneNumber, phoneNumber).list();
}
}
--
Gitblit v1.7.1