Home Explore Help
Sign In
yonge
/
mec
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

# Conflicts:
#	mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherContractController.java
zouxuan 3 years ago
parent
2657be02f8 11b42a4c06
commit
2efa5c4524
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherContractController.java

+ 1 - 1
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherContractController.java
View File 

@@ -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);
 
 			}