zouxuan %!s(int64=5) %!d(string=hai) anos
pai
achega
6fa752749c

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

@@ -64,6 +64,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		if(user != null && user.getId() != null){
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
+				if(StringUtils.isEmpty(user.getPassword())){
+					employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
+				}
 				employee.setOrganId(employee.getOrganIdList());
 				employee.setUserId(user.getId());
 				employeeDao.insert(employee);

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -381,7 +381,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 					studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
 
 					courseSchedule.setUpdateTime(date);
-					courseSchedule.setStudentNum(courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum() + 1);
+					courseSchedule.setStudentNum((courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum()) + 1);
 					courseScheduleDao.update(courseSchedule);
 					studentAttendanceDao.insert(studentAttendance);
 				}

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

@@ -78,8 +78,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(teacher1 == null || teacher1.getId() == null){
 				teacher.setId(id);
 				teacher.setDelFlag(YesOrNoEnum.NO);
-				teacherDao.updateUser(teacher);
 				teacherDao.insert(teacher);
+				if(user.getUserType() == SysUserType.SYSTEM){
+					teacher.setOrganId(null);
+				}
+				teacherDao.updateUser(teacher);
 			}else {
 				throw new Exception("用户已存在");
 			}