Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-28 00a75e130e332902ca4aea01badfcf4640174eb0

Merge remote-tracking branch 'origin/master'

 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);
    }