From cae0aec951f3e358bf7dbd95aa3981c2da14d011 Mon Sep 17 00:00:00 2001 From: GME Date: Fri, 14 Jun 2019 18:21:50 +0200 Subject: [PATCH] Fix minor bug - History search for all with date --- src/main/java/database/transaction/TransactionDao.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/database/transaction/TransactionDao.java b/src/main/java/database/transaction/TransactionDao.java index 397552c..76d6c38 100644 --- a/src/main/java/database/transaction/TransactionDao.java +++ b/src/main/java/database/transaction/TransactionDao.java @@ -90,8 +90,9 @@ public class TransactionDao { public List getAllTransactionBetweenDate(String wallet_hash, String start, String end, int number) throws Exception{ createTransactionDaoConnection(); QueryBuilder queryBuilder = transactionDao.queryBuilder(); - queryBuilder.where().eq("transaction_from",wallet_hash).or().eq("transaction_to",wallet_hash); - queryBuilder.where().between("transaction_date", new BigInteger(start), new BigInteger(end)); + queryBuilder.where().eq("transaction_from",wallet_hash) + .or().eq("transaction_to",wallet_hash) + .and().between("transaction_date", new BigInteger(start), new BigInteger(end)); if(number!=0){ queryBuilder.limit(new Long(number));