From 512ac1b945598dcc4150bc8865e87b9aa7a26b9e Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 23 Aug 2024 11:07:58 +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 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 d4a292e..5009ee0 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 @@ -30,10 +30,9 @@ public class RevenueRewardUserQueryController { @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { if (Objects.isNull(queryParams.getQueryOrgId())) { queryParams.setQueryOrgId(orgId); - } else { - if (Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); - } + } + if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) { + queryParams.setQueryUserId(userId); } return revenueRewardQueryService.getRevenueRewardAbstract(queryParams); } @@ -46,10 +45,9 @@ public class RevenueRewardUserQueryController { @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { if (Objects.isNull(queryParams.getQueryOrgId())) { queryParams.setQueryOrgId(orgId); - } else { - if (Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); - } + } + if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) { + queryParams.setQueryUserId(userId); } return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams), UseGetRevenueRewardRecordVo.class); }