From e6d4f1ee662daa205b79df38bec35468e168957c Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Tue, 7 Aug 2012 11:02:12 +0100 Subject: [PATCH] dont show soft-deleted savings products. --- .../service/SavingProductReadPlatformServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java index ca861fdea..2dac3c05a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java @@ -44,7 +44,7 @@ public class SavingProductReadPlatformServiceImpl implements SavingProductMapper savingProductMapper=new SavingProductMapper(); - String sql = "select " +savingProductMapper.savingProductSchema(); + String sql = "select " + savingProductMapper.savingProductSchema() + " where sp.is_deleted=0"; return this.jdbcTemplate.query(sql,savingProductMapper, new Object[]{}); @@ -67,7 +67,7 @@ public class SavingProductReadPlatformServiceImpl implements try{ SavingProductMapper savingProductMapper=new SavingProductMapper(); String sql = "select " + savingProductMapper.savingProductSchema() - + " where sp.id = ?"; + + " where sp.id = ? and sp.is_deleted=0"; SavingProductData productData = this.jdbcTemplate.queryForObject(sql, savingProductMapper, new Object[] { savingProductId }); @@ -90,12 +90,9 @@ public class SavingProductReadPlatformServiceImpl implements } private static final class SavingProductMapper implements RowMapper { - public SavingProductMapper() { - - } public String savingProductSchema(){ - return "sp.id as id,sp.name as name, sp.description as description,sp.currency_code as currencyCode, sp.currency_digits as currencyDigits,sp.interest_rate as interestRate,sp.created_date as createdon, sp.lastmodified_date as modifiedon, sp.is_deleted as isdeleted, " + return "sp.id as id,sp.name as name, sp.description as description,sp.currency_code as currencyCode, sp.currency_digits as currencyDigits,sp.interest_rate as interestRate,sp.created_date as createdon, sp.lastmodified_date as modifiedon, " + "curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol" + " from portfolio_product_savings sp join ref_currency curr on curr.code = sp.currency_code"; }