|
@@ -4,6 +4,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
+import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.dz.domain.DzSchool;
|
|
import com.ruoyi.dz.domain.DzSchool;
|
|
|
import com.ruoyi.dz.mapper.DzSchoolMapper;
|
|
import com.ruoyi.dz.mapper.DzSchoolMapper;
|
|
@@ -85,6 +86,10 @@ public class DzTeacherServiceImpl implements IDzTeacherService
|
|
|
dzTeacher.setDeptId(school.getDeptId());
|
|
dzTeacher.setDeptId(school.getDeptId());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (null==dzTeacher.getDeptId()){
|
|
|
|
|
+ //如果deptId为空,需要从当前用户的机构中获取(非超级管理员)
|
|
|
|
|
+ dzTeacher.setDeptId(SecurityUtils.getDeptId());
|
|
|
|
|
+ }
|
|
|
dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
|
|
dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
|
|
|
Long teacherId = dzTeacher.getTeacherId();
|
|
Long teacherId = dzTeacher.getTeacherId();
|
|
|
Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), null, dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());
|
|
Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), null, dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());
|