悬赏招亲

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java

@@ -37,12 +37,12 @@ public class WalletAccountUserQueryController {
                                                                             @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId,
                                                                             PageUtil pageUtil,
                                                                             UserPageWalletAccountRecordQueryParam queryParam) {
-        if (Objects.isNull(queryParam.getQueryUserId())) {
-            queryParam.setQueryUserId(userId);
-        }
         if (Objects.isNull(queryParam.getQueryOrgId())) {
             queryParam.setQueryOrgId(orgId);
         }
+        if (Objects.isNull(queryParam.getQueryOrgId()) && Objects.isNull(queryParam.getQueryUserId())) {
+            queryParam.setQueryUserId(userId);
+        }
         return PageUtil.convert(walletAccountQueryService.pageWalletAccountRecord(queryParam, pageUtil), UserGetWalletAccountRecordVo.class);
     }