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

Merge pull request #1452 from shahrahul1985/MIFOSX-2103

Browse Source 
MIFOSX-2103:Manage employees display is not working as expected
This commit is contained in:
Vishwas Babu A J
2015-08-17 17:47:23 +05:30
parent 5536342093 72495da5b9
commit e2ddedd531
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/service/StaffReadPlatformServiceImpl.java
+14 -2
View File
@@ -118,6 +118,7 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService {
final StringBuilder sqlBuilder = new StringBuilder(100);
sqlBuilder.append("s.id as id, s.display_name as displayName ");
sqlBuilder.append("from m_staff s ");
sqlBuilder.append("join m_office o on o.id = s.office_id ");
this.schemaSql = sqlBuilder.toString();
}
@@ -142,10 +143,13 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService {
@Override
public Collection<StaffData> retrieveAllStaffForDropdown(final Long officeId) {
//adding the Authorization criteria so that a user cannot see an employee who does not belong to his office or a sub office for his office.
final String hierarchy = this.context.authenticatedUser().getOffice().getHierarchy();
final Long defaultOfficeId = defaultToUsersOfficeIfNull(officeId);
final String sql = "select " + this.lookupMapper.schema() + " where s.office_id = ? and s.is_active=1 ";
final String sql = "select " + this.lookupMapper.schema() + " where s.office_id = ? and s.is_active=1 and o.hierarchy like '"+ hierarchy+ "%'";
return this.jdbcTemplate.query(sql, this.lookupMapper, new Object[] { defaultOfficeId });
}
@@ -160,10 +164,14 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService {
@Override
public StaffData retrieveStaff(final Long staffId) {
//adding the Authorization criteria so that a user cannot see an employee who does not belong to his office or a sub office for his office.
final String hierarchy = this.context.authenticatedUser().getOffice().getHierarchy();
try {
final StaffMapper rm = new StaffMapper();
final String sql = "select " + rm.schema() + " where s.id = ?";
final String sql = "select " + rm.schema() + " where s.id = ? and o.hierarchy like '"+ hierarchy+ "%'" ;
return this.jdbcTemplate.queryForObject(sql, rm, new Object[] { staffId });
} catch (final EmptyResultDataAccessException e) {
@@ -211,6 +219,10 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService {
} else if (status.equalsIgnoreCase("all")) {} else {
throw new UnrecognizedQueryParamException("status", status, new Object[] { "all", "active", "inactive" });
}
//adding the Authorization criteria so that a user cannot see an employee who does not belong to his office or a sub office for his office.
final String hierarchy = this.context.authenticatedUser().getOffice().getHierarchy();
extraCriteria.append(" and o.hierarchy like '"+ hierarchy+ "%' ");
if (StringUtils.isNotBlank(extraCriteria.toString())) {
extraCriteria.delete(0, 4);