Merge remote-tracking branch 'origin/milestone-20251016-现金管理' into milestone-20251016-现金管理

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);
         }