调整应收应付的问题

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -559,7 +559,6 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("operateType", type);
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
-		info.expression(PredicateUtils.isNotNull("transferTime"));
 		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 
 		Page<BankTransfer> pageBankTran = bankTransferDao.findAll(new Specification<BankTransfer>() {
@@ -639,7 +638,9 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.expression(PredicateUtils.lte("transferTime", new Date(toDate), false));
 		}
 		if (!StringUtils.isEmpty(remitteeType)) {
-			info.expression(PredicateUtils.eq("type", remitteeType, false));
+			if (!"ALL".equals(remitteeType)) {
+				info.expression(PredicateUtils.eq("type", remitteeType, false));
+			}
 		}
 	}
 }