From cf3c19b39817c464657a6505af842d99852f0689 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 21 三月 2026 19:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
index 8812b97..245f3f3 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -262,16 +262,17 @@
XpOperationsUserVO xpOperationsUserVO = xpOperationsUserService.detailById(id);
if (xpOperationsUserVO.getAvatar() != null) {
JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getAvatar());
- String downloadUrl = null;
- try {
- // 1
- String downloadUrl1 = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- downloadUrl = downloadUrl1;
- } catch (Exception e) {
- e.printStackTrace();
+ if(jsonObject!=null){
+ String downloadUrl = null;
+ try {
+ // 1
+ downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ jsonObject.put("url", downloadUrl);
+ xpOperationsUserVO.setAvatar(jsonObject.toJSONString());
}
- jsonObject.put("url", downloadUrl);
- xpOperationsUserVO.setAvatar(jsonObject.toJSONString());
}
return R.ok(xpOperationsUserVO);
--
Gitblit v1.7.1