update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -107,6 +107,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				throw new BizException("手机号已存在");
 			}
 		}
+		employee.setUsername(employee.getRealName());
 		employeeDao.update(employee);
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -48,10 +48,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private SysUserCashAccountDao sysUserCashAccountDao;
 	@Autowired
-	private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
-	@Autowired
-	private ClassGroupTeacherSalaryDao classGroupTeacherSalaryDao;
-	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private ImFeignService imFeignService;
@@ -361,11 +357,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
 				teacher.setFlowOrganRangeId(teacher.getFlowOrganRange());
 				List<String> organNames = organizationDao.findByOrganIds(teacher.getFlowOrganRange());
-				if(StringUtils.isNotEmpty(teacher.getOrganId())){
-					teacher.setOrganName(organizationDao.get(Integer.parseInt(teacher.getOrganId())).getName());
-				}
 				teacher.setFlowOrganRange(StringUtils.join(organNames,","));
 			}
+			if(StringUtils.isNotEmpty(teacher.getOrganId())){
+				teacher.setOrganName(organizationDao.get(Integer.parseInt(teacher.getOrganId())).getName());
+			}
 			//专业技能
 			if(StringUtils.isNotEmpty(teacher.getSubjectId())){
 				teacher.setSubjectName(subjectDao.findBySubIds(teacher.getSubjectId()));