From 1f46eb27f4221577856984a1d41818a38f568d44 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 20 Oct 2025 11:14:08 +0800
Subject: [PATCH] =?UTF-8?q?10-20=20=E6=94=B6=E6=AC=BE=EF=BC=9A=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=E5=AE=A2=E6=9C=8D=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 4836dbb..22ffa87 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -193,7 +193,9 @@ public class CashCollectionServiceImpl implements CashCollectionService {
             cashCollection.setSubmitterId(null);
         }if (cashCollection.getCashRoleId()==0){
             //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选
-            cashCollection.setStatus(null);
+            if(cashCollection.getStatus()==null){
+                cashCollection.setStatus(1234560);
+            }
             cashCollection.setSubmitterId(cashCollection.getSubmitterId());
             cashCollection.setReceivedMarket(null);
         }