Merge branch '20220914' into master_saas

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

@@ -239,7 +239,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
                 throw new BizException("入职日期不可晚于转正日期");
             }
         }
-        BeanUtils.copyProperties(user, teacher);
         teacher.setUpdateTime(new Date());
         teacher.setTeacherOrganId(teacher.getOrganId());
         teacherDao.eduUpdateTeacher(teacher);
@@ -249,6 +248,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         imGroupDao.updateUserFriendNickname(teacher.getId(), teacher.getRealName());
         imFeignService.update(new ImUserModel(teacher.getId().toString(), teacher.getRealName(), teacher.getAvatar()));
         //更新OA信息
+        teacher.setAvatar(user.getAvatar());
+        teacher.setUsername(user.getUsername());
+        teacher.setRealName(user.getRealName());
+        teacher.setPhone(user.getPhone());
+        teacher.setGender(user.getGender());
         oaUserService.updateOaUser(teacher);
     }