From f91bb885d680d3f30cbf1bcffdd6819b3b10e6b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 21:03:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
index 91b8be1..2b2d386 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -68,8 +69,11 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
.eq(TAppUserAddress::getDefaultAddress, 1));
+ if(Objects.isNull(appUserAddress)){
+ return AjaxResult.success();
+ }
appUserAddress.setUid(appUserAddress.getId().toString());
- return AjaxResult.ok(appUserAddress);
+ return AjaxResult.success(appUserAddress);
}
@@ -121,7 +125,9 @@
@ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
@GetMapping(value = "/getDetailById")
public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
- return R.ok(appUserAddressService.getById(id));
+ TAppUserAddress appUserAddress = appUserAddressService.getById(id);
+ appUserAddress.setUid(appUserAddress.getId().toString());
+ return R.ok(appUserAddress);
}
/**
--
Gitblit v1.7.1