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

fixed the search centers and search groups issue,

Browse Source 
'group level was not appended when the sqlQueryCrieteria is not empty
This commit is contained in:
Anuruddha Premalal
2013-05-04 11:28:55 +05:30
parent 0caf255a60
commit 56fdd170ca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java
+2 -2
View File
@@ -73,13 +73,13 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
// caused by the same name of columns in m_office and m_group tables // caused by the same name of columns in m_office and m_group tables
private String getCenterExtraCriteria(final SearchParameters searchCriteria) { private String getCenterExtraCriteria(final SearchParameters searchCriteria) {
String extraCriteria = " and g.level_id = " + GroupTypes.CENTER.getId() + " "; String extraCriteria = " and g.level_id = " + GroupTypes.CENTER.getId();
String sqlQueryCriteria = searchCriteria.getSqlSearch(); String sqlQueryCriteria = searchCriteria.getSqlSearch();
if (StringUtils.isNotBlank(sqlQueryCriteria)) { if (StringUtils.isNotBlank(sqlQueryCriteria)) {
sqlQueryCriteria = sqlQueryCriteria.replaceAll(" display_name ", " g.display_name "); sqlQueryCriteria = sqlQueryCriteria.replaceAll(" display_name ", " g.display_name ");
sqlQueryCriteria = sqlQueryCriteria.replaceAll("display_name ", "g.display_name "); sqlQueryCriteria = sqlQueryCriteria.replaceAll("display_name ", "g.display_name ");
extraCriteria = " and (" + sqlQueryCriteria + ")"; extraCriteria += " and (" + sqlQueryCriteria + ")";
} }
final Long officeId = searchCriteria.getOfficeId(); final Long officeId = searchCriteria.getOfficeId();
mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
if (sqlSearch != null) { if (sqlSearch != null) {
sqlSearch = sqlSearch.replaceAll(" display_name ", " g.display_name "); sqlSearch = sqlSearch.replaceAll(" display_name ", " g.display_name ");
sqlSearch = sqlSearch.replaceAll("display_name ", "g.display_name "); sqlSearch = sqlSearch.replaceAll("display_name ", "g.display_name ");
extraCriteria = " and (" + sqlSearch + ")"; extraCriteria += " and (" + sqlSearch + ")";
} }
final Long officeId = searchCriteria.getOfficeId(); final Long officeId = searchCriteria.getOfficeId();