From 995fd2bdb3cc13e52bcd4dd6cbdae33e47936745 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 23 Oct 2025 13:40:36 +0800
Subject: [PATCH] =?UTF-8?q?10-23=20=E6=94=B6=E6=AC=BE=EF=BC=9A=E6=80=BB?=
 =?UTF-8?q?=E9=83=A8=E8=B4=A2=E5=8A=A1=E5=8C=BA=E5=88=86=E5=B7=B2=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E4=B8=8E=E5=B7=B2=E5=AE=8C=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
index d6a602d..5a6a761 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -188,9 +188,9 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         }
       //  cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket()));
         if (cashCollection.getCashRoleId()==2) {
-            //角色是总部时，传1346，sql处理为（1，3，4，6）筛选，
-
-            cashCollection.setStatus(1346);
+            //角色是总部时，若不特地传状态，传1346，sql处理为（1，3，4，6）筛选，
+            if(cashCollection.getStatus()==null){
+            cashCollection.setStatus(1346);}
             cashCollection.setSubmitterId(null);
             cashCollection.setReceivedMarket(null);
             cashCollection.setSubmitterMarket(null);