From 969d3d636fc4d37cf05edb7383dec351e639410c Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 13 Nov 2025 13:56:48 +0800 Subject: [PATCH] =?UTF-8?q?11-13=20=E6=94=B6=E6=AC=BE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= 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 67d4716..949fc64 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -250,11 +250,11 @@ public class CashCollectionServiceImpl implements CashCollectionService { //多条件查询收款订单列表 @Override public PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection) { - //将操作人的地区列表改为id + /* //将操作人的地区列表改为id List markets = marketMapper.getMarketIds(cashCollection.getMarkets()); if (markets.contains("9") || markets.contains("9999")) { markets = null; - } + }*/ // cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); if (cashCollection.getCashRoleId() == 2) { //角色是总部时，若不特地传状态，传1346，sql处理为（1，3，4，6）筛选， @@ -291,7 +291,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setSubmitterId(cashCollection.getSubmitterId()); cashCollection.setReceivedMarket(null); } - cashCollection.setMarkets(markets); + // cashCollection.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection); return new PageInfo<>(cashCollections);