|
@@ -553,11 +553,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
|
|
|
teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
|
|
|
teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
|
|
|
- if (teacher.getTenantId() == -1L) {
|
|
|
- teacher.setSettlementFrom(ESettlementFrom.TEACHER);
|
|
|
- } else if (teacherSubmitReq.getIsSettlement() != null) {
|
|
|
- teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
|
|
|
- }
|
|
|
if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
|
|
|
return teacher;
|
|
|
}
|