悬赏招亲

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