X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=database%2Fwallet_store.go;fp=database%2Fwallet_store.go;h=a0c2a36d28363c345774784303de3726ccb70bee;hp=b810e46a756bf0d019b96ae7a50999ffbd16cffb;hb=c2925d029543cdaee6e48e684397d21d3d05df9f;hpb=aa09e54e00d35ad4532f74f0290501611d510c1a

diff --git a/database/wallet_store.go b/database/wallet_store.go
index b810e46a..a0c2a36d 100644
--- a/database/wallet_store.go
+++ b/database/wallet_store.go
@@ -342,6 +342,7 @@ func (store *WalletStore) ListAccountUTXOs(id string, isSmartContract bool) ([]*
 
 		confirmedUTXOs = append(confirmedUTXOs, utxo)
 	}
+
 	return confirmedUTXOs, nil
 }
 
@@ -376,8 +377,11 @@ func (store *WalletStore) ListTransactions(accountID string, StartTxID string, c
 			return nil, err
 		}
 
-		annotatedTxs = append(annotatedTxs, annotatedTx)
-		txNum--
+		if accountID == "" || wallet.FindTransactionsByAccount(annotatedTx, accountID) {
+			annotatedTxs = append([]*query.AnnotatedTx{annotatedTx}, annotatedTxs...)
+			txNum--
+		}
+
 	}
 
 	return annotatedTxs, nil