CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

Issue-331

Browse Source
This commit is contained in:
kushagrasingh
2013-05-08 12:11:42 +05:30
parent e55a37fe1a
commit 97b8dab831
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java
+2 -2
View File
@@ -106,7 +106,7 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
// string sql is the sql statement that will be executed by jdbc.
String sql="";
// if calendarType options are not given by user then return all calendars.
if(calendarTypeOptions.isEmpty()) {
if(calendarTypeOptions.isEmpty() || calendarTypeOptions == null) {
sql = rm.schema() + " and ci.entity_id = ? and ci.entity_type_enum = ? order by c.start_date ";
result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, entityTypeId });
} else if(!calendarTypeOptions.isEmpty()){
@@ -127,7 +127,7 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
String parentHeirarchyCondition = getParentHierarchyCondition(ceType);
//FIXME :AA center is the parent entity of group, change this code to support more parent entity types.
if(calendarTypeOptions.isEmpty()){
if(calendarTypeOptions.isEmpty() || calendarTypeOptions == null){
sql = rm.schema() + " " + parentHeirarchyCondition + " and ci.entity_type_enum = ? order by c.start_date ";
result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, CalendarEntityType.CENTERS.getValue() });
} else {