|
@@ -468,7 +468,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
.eq(Teacher::getUserId, teacher.getUserId())
|
|
.eq(Teacher::getUserId, teacher.getUserId())
|
|
);
|
|
);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ // 老师头像
|
|
|
|
+ teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
|
|
baseMapper.updateById(teacher);
|
|
baseMapper.updateById(teacher);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -535,6 +536,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
teacher.setIsTestUser(teacherSubmitReq.getIsTestUser());
|
|
teacher.setIsTestUser(teacherSubmitReq.getIsTestUser());
|
|
teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
|
|
teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
|
|
teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
|
|
teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
|
|
|
|
+ teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
|
|
if (teacher.getTenantId() == -1L) {
|
|
if (teacher.getTenantId() == -1L) {
|
|
teacher.setSettlementFrom(ESettlementFrom.TEACHER);
|
|
teacher.setSettlementFrom(ESettlementFrom.TEACHER);
|
|
} else if (teacherSubmitReq.getIsSettlement() != null) {
|
|
} else if (teacherSubmitReq.getIsSettlement() != null) {
|