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