From 864494eb35b4ac091b80d75b80ec10c7b6dd5a01 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Mon, 2 Sep 2024 15:28:22 +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/WalletAccountUserQueryController.java              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java
index d2fac1b..cc3af94 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java
+++ b/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);
     }