|  | @@ -201,17 +201,17 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 | 
											
												
													
														|  |  	public Map<String, Object> levelDetail(Integer userId) {
 |  |  	public Map<String, Object> levelDetail(Integer userId) {
 | 
											
												
													
														|  |  		Map<String,Object> resultMap = new HashMap<>(4);
 |  |  		Map<String,Object> resultMap = new HashMap<>(4);
 | 
											
												
													
														|  |  		//维修技师所在分部列表
 |  |  		//维修技师所在分部列表
 | 
											
												
													
														|  | -		List<Integer> repairOrgans = employeeDao.queryRepairOrganList(userId);
 |  | 
 | 
											
												
													
														|  | -		resultMap.put("repairOrgans",repairOrgans);
 |  | 
 | 
											
												
													
														|  | 
 |  | +		List<Integer> repair = employeeDao.queryRepairOrganList(userId);
 | 
											
												
													
														|  | 
 |  | +		resultMap.put("repair",repair);
 | 
											
												
													
														|  |  		//教务老师所在分部列表
 |  |  		//教务老师所在分部列表
 | 
											
												
													
														|  | -		List<Integer> educationOrgans = employeeDao.queryEducationOrganList(userId);
 |  | 
 | 
											
												
													
														|  | -		resultMap.put("educationOrgans",educationOrgans);
 |  | 
 | 
											
												
													
														|  | 
 |  | +		List<Integer> education = employeeDao.queryEducationOrganList(userId);
 | 
											
												
													
														|  | 
 |  | +		resultMap.put("education",education);
 | 
											
												
													
														|  |  		//运营主管所在分部列表
 |  |  		//运营主管所在分部列表
 | 
											
												
													
														|  | -		List<Integer> teamTeacherOrgans = employeeDao.queryTeamTeacherOrganList(userId);
 |  | 
 | 
											
												
													
														|  | -		resultMap.put("teamTeacherOrgans",teamTeacherOrgans);
 |  | 
 | 
											
												
													
														|  | 
 |  | +		List<Integer> teamTeacher = employeeDao.queryTeamTeacherOrganList(userId);
 | 
											
												
													
														|  | 
 |  | +		resultMap.put("teamTeacher",teamTeacher);
 | 
											
												
													
														|  |  		//乐队指导所在分部列表
 |  |  		//乐队指导所在分部列表
 | 
											
												
													
														|  | -		List<Integer> directorOrgans = employeeDao.queryDirectorOrganList(userId);
 |  | 
 | 
											
												
													
														|  | -		resultMap.put("directorOrgans",directorOrgans);
 |  | 
 | 
											
												
													
														|  | 
 |  | +		List<Integer> director = employeeDao.queryDirectorOrganList(userId);
 | 
											
												
													
														|  | 
 |  | +		resultMap.put("director",director);
 | 
											
												
													
														|  |  		return resultMap;
 |  |  		return resultMap;
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -254,6 +254,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 | 
											
												
													
														|  |  //		imFeignService.groupBatchQuit(groupModels);
 |  |  //		imFeignService.groupBatchQuit(groupModels);
 | 
											
												
													
														|  |  //		employeeDao.employeeLevel(employeeLevelDtos);
 |  |  //		employeeDao.employeeLevel(employeeLevelDtos);
 | 
											
												
													
														|  |  		//用户退群和加群
 |  |  		//用户退群和加群
 | 
											
												
													
														|  | -		employeeDao.updateUserDemissionDate(levelUserId);
 |  | 
 | 
											
												
													
														|  | 
 |  | +//		employeeDao.updateUserDemissionDate(levelUserId);
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  }
 |  |  }
 |