Merge remote-tracking branch 'origin/saas' into saas

# Conflicts:
#	mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherContractController.java

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherContractController.java

@@ -52,7 +52,7 @@ public class TeacherContractController extends BaseController {
 			//判断分部
 			Teacher teacher = teacherService.get(sysUser.getId());
 			
-			if(teacher == null || (teacher.getTeacherOrganId() == 55 ||teacher.getTeacherOrganId() == 59)){
+			if(teacher == null || teacher.getTeacherOrganId() == null || (teacher.getTeacherOrganId() == 55 ||teacher.getTeacherOrganId() == 59)){
 				return succeed(false);
 			}