From 7193d05114f347c13533554173a65921c309c55c Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 29 Oct 2024 10:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/RevenueRewardUserQueryController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java index 5009ee0..ee6793b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java @@ -43,11 +43,12 @@ public class RevenueRewardUserQueryController { UsePageRevenueRewardRecordQueryParams queryParams, @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { - if (Objects.isNull(queryParams.getQueryOrgId())) { - queryParams.setQueryOrgId(orgId); - } if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); + if (Objects.nonNull(orgId)){ + queryParams.setQueryOrgId(orgId); + }else{ + queryParams.setQueryUserId(userId); + } } return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams), UseGetRevenueRewardRecordVo.class); }