WebSVN – SmartDukaan – Diff – /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java

 	public List<Agent> getAgents() {
 		String currentEmailId = getCurrentAgentEmailId();
 		log.info("currentEmailId="+currentEmailId);
 		long managerId =0;
+		boolean isManager=false;
 		List<Agent> managedAgents = new ArrayList<Agent>();
 		for(Agent tempAgent : agents) {
 			if(StringUtils.equalsIgnoreCase(tempAgent.getEmailId(), currentEmailId)) {
 				managerId = tempAgent.getId();
 				break;
 			return agents;
 		} else {
 			if(managerId!=0) {
 				for(Agent tempAgent : agents) {
 					if(tempAgent.getManagerId() == managerId){
+						isManager=true;
 						managedAgents.add(tempAgent);
+					}
+				}
+				if (isManager){
+					for(Agent tempAgent : agents) {
+						if(tempAgent.getId() == managerId){
+							managedAgents.add(tempAgent);
+						}
+					}
+				}
 				return managedAgents;
+			}
 			else {
 				return null;
+			}

Subversion Repositories SmartDukaan