From d8786c8c3b5084bdad9ef318d056d81579e622f0 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 30 九月 2024 11:11:04 +0800 Subject: [PATCH] 合并 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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 e2a2dad..741100d 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 @@ -70,10 +70,10 @@ TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId) .eq(TAppUserAddress::getDefaultAddress, 1)); if(Objects.isNull(appUserAddress)){ - return AjaxResult.ok(new TAppUserAddress()); + return AjaxResult.success(); } appUserAddress.setUid(appUserAddress.getId().toString()); - return AjaxResult.ok(appUserAddress); + return AjaxResult.success(appUserAddress); } @@ -125,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 byId = appUserAddressService.getById(id); + byId.setUid(byId.getId().toString()); + return R.ok(byId); } /** -- Gitblit v1.7.1