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