From 9f4367ee394eabded60290dfaefb5e057bb0b3d8 Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Mon, 9 Mar 2026 14:35:14 +0800
Subject: [PATCH] =?UTF-8?q?20260309=20=E9=92=B1=E5=8C=85=E6=98=8E=E6=99=B0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96pro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/cash/CashCollectionController.java   | 21 ++++++++-------------
 .../resources/cashMapper/CashCollectionMapper.xml   | 12 ++++++++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
index 0bfab71..47d78c2 100644
--- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
+++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java
@@ -332,17 +332,18 @@ public class CashCollectionController {
                 return Result.error(errorMsg);
             }
 
-            // 校验精网号是否为空
-            if (page.getUserWalletRecord() == null || page.getUserWalletRecord().getJwcode() == null) {
-                String errorMsg = languageTranslationUtil.translate("精网号不能为空", lang);
+            UserWalletRecord queryCondition = page.getUserWalletRecord();
+            if (queryCondition == null ||
+                    (queryCondition.getJwcode() == null && queryCondition.getWalletId() == null)) {
+                String errorMsg = languageTranslationUtil.translate("精网号和钱包 ID 不能同时为空", lang);
                 return Result.error(errorMsg);
             }
 
             Result result = Result.success(cashCollectionService.selectWalletRecordsByJwcodeAndWalletId(
                     page.getPageNum(),
                     page.getPageSize(),
-                    page.getUserWalletRecord().getJwcode(),
-                    page.getUserWalletRecord().getWalletId()
+                    queryCondition.getJwcode(),
+                    queryCondition.getWalletId()
             ));
 
             // 对返回结果进行多语言转换
@@ -367,10 +368,8 @@ public class CashCollectionController {
             Integer pageNum = null;
             Integer pageSize = null;
 
-            // 处理 jwcode 参数（兼容 null 和空字符串）
             if (params.containsKey("jwcode")) {
                 Object jwcodeObj = params.get("jwcode");
-                // 判断是否为 null 或空字符串
                 if (jwcodeObj != null) {
                     String jwcodeStr = jwcodeObj.toString();
                     if (!jwcodeStr.isEmpty()) {
@@ -383,7 +382,6 @@ public class CashCollectionController {
                 }
             }
 
-            // 处理 market 参数
             if (params.containsKey("market")) {
                 Object marketObj = params.get("market");
                 if (marketObj != null && !marketObj.toString().isEmpty()) {
@@ -391,14 +389,13 @@ public class CashCollectionController {
                 }
             }
 
-            // 处理分页参数
             if (params.containsKey("pageNum")) {
                 Object pageNumObj = params.get("pageNum");
                 if (pageNumObj != null && !pageNumObj.toString().isEmpty()) {
                     try {
                         pageNum = ((Number) pageNumObj).intValue();
                     } catch (Exception e) {
-                        pageNum = 1; // 默认第一页
+                        pageNum = 1;
                     }
                 }
             }
@@ -409,12 +406,11 @@ public class CashCollectionController {
                     try {
                         pageSize = ((Number) pageSizeObj).intValue();
                     } catch (Exception e) {
-                        pageSize = 10; // 默认每页 10 条
+                        pageSize = 10;
                     }
                 }
             }
 
-            // 如果没有传分页参数，设置默认值
             if (pageNum == null) {
                 pageNum = 1;
             }
@@ -430,7 +426,6 @@ public class CashCollectionController {
                     translateUserWalletVO(vo, lang);
                 }
             }
-
             return Result.success(result);
         } catch (Exception e) {
             String errorMsg = languageTranslationUtil.translate("查询失败", lang);
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index 7b3877b..52818bc 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -440,10 +440,14 @@
         LEFT JOIN user u ON uwr.jwcode = u.jwcode
         LEFT JOIN market m ON u.market = m.id
         LEFT JOIN wallet w ON uwr.wallet_id = w.id
-        WHERE uwr.jwcode = #{jwcode}
-        <if test="walletId != null">
-            AND uwr.wallet_id = #{walletId}
-        </if>
+        <where>
+            <if test="jwcode != null">
+                AND uwr.jwcode = #{jwcode}
+            </if>
+            <if test="walletId != null">
+                AND uwr.wallet_id = #{walletId}
+            </if>
+        </where>
         ORDER BY uwr.create_time DESC
     </select>