=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2015-04-17 08:57:30 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2015-04-23 13:43:59 +0000 @@ -595,7 +595,7 @@ String sql = "insert into " + TABLE_NAME_DATA_APPROVAL_MIN_LEVEL + " (datasetid,periodid,organisationunitid,attributeoptioncomboid,minlevel) " + - "select da.datasetid, da.periodid, da.organisationunitid, da.attributeoptioncomboid, min(dal.level) as minlevel " + + "select da.datasetid, da.periodid, da.organisationunitid, da.attributeoptioncomboid, dal.level as minlevel " + "from dataapproval da " + "inner join dataapprovallevel dal on da.dataapprovallevelid=dal.dataapprovallevelid " + "where not exists ( " + @@ -611,8 +611,7 @@ sql += "da.organisationunitid = ous2.idlevel" + level.getLevel() + " or "; } - sql = TextUtils.removeLastOr( sql ) + ") ) " + - "group by da.datasetid, da.periodid, da.organisationunitid, da.attributeoptioncomboid;"; + sql = TextUtils.removeLastOr( sql ) + ") )"; log.info( "Insert data approval min level SQL: " + sql );