update

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

@@ -143,19 +143,21 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 
 	@Override
 	public void employeeOperate(Long employeeId, EmployeeOperateEnum operate) {
+		Employee employee = employeeDao.get(employeeId.intValue());
 		switch (operate){
 			case RESET_PASSWORD:
 				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				break;
 			case LOCK_UNLOCK:
+				SysUser sysUser = sysUserFeignService.queryUserById(employee.getUserId());
+				if(employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
+					throw new BizException("操作失败：离职员工不允许解冻");
+				}
 				employeeDao.updateUserLockStatus(employeeId);
 				break;
 			case DEMISSION:
+				employeeDao.updateUserLock(employeeId,1);
 				employeeDao.updateUserDemissionDate(employeeId);
-				Employee employee = employeeDao.get(employeeId.intValue());
-				if(employee.getDemissionDate() != null){
-					employeeDao.updateUserLock(employeeId,1);
-				}
 				break;
 			case REINSTATE:
 				employeeDao.updateUserDemissionDate(employeeId);

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -24,6 +24,7 @@ import com.ym.mec.biz.dal.entity.TeacherAttendance;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SignStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TeacherAttendanceService;