11-13 收款导出修复

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -250,11 +250,11 @@ public class CashCollectionServiceImpl implements CashCollectionService {
     //多条件查询收款订单列表
     @Override
     public PageInfo<CashCollection> selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection) {
-        //将操作人的地区列表改为id
+     /*   //将操作人的地区列表改为id
         List<String> 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<CashCollection> cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection);
         return new PageInfo<>(cashCollections);