|
@@ -35,6 +35,10 @@ public class TeacherController extends BaseController {
|
|
if (teacherServiceByCertificateNum != null) {
|
|
if (teacherServiceByCertificateNum != null) {
|
|
return failed("系统已存在该证件号的老师,请核查");
|
|
return failed("系统已存在该证件号的老师,请核查");
|
|
}
|
|
}
|
|
|
|
+ Integer organId = SecurityUtils.getUser().getOrganId();
|
|
|
|
+ if(organId != null){
|
|
|
|
+ teacher.setOrganId(organId);
|
|
|
|
+ }
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
teacher.setCreateTime(date);
|
|
teacher.setCreateTime(date);
|
|
teacher.setUpdateTime(date);
|
|
teacher.setUpdateTime(date);
|
|
@@ -52,6 +56,10 @@ public class TeacherController extends BaseController {
|
|
@ApiOperation(value = "修改教师")
|
|
@ApiOperation(value = "修改教师")
|
|
@PutMapping("/update")
|
|
@PutMapping("/update")
|
|
public Object update(@RequestBody Teacher teacher) {
|
|
public Object update(@RequestBody Teacher teacher) {
|
|
|
|
+ Integer organId = SecurityUtils.getUser().getOrganId();
|
|
|
|
+ if(organId != null){
|
|
|
|
+ teacher.setOrganId(organId);
|
|
|
|
+ }
|
|
Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
|
|
Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
|
|
if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
|
|
if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
|
|
return failed("系统已存在该证件号的老师,请核查");
|
|
return failed("系统已存在该证件号的老师,请核查");
|
|
@@ -74,7 +82,7 @@ public class TeacherController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "根据教师编号查询教师课程班列表")
|
|
@ApiOperation(value = "根据教师编号查询教师课程班列表")
|
|
- @GetMapping("/getclass/{id}")
|
|
|
|
|
|
+ @GetMapping("/getClass/{id}")
|
|
public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
|
|
public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
|
|
return succeed(classGroupService.findClassGroup4Teacher(id));
|
|
return succeed(classGroupService.findClassGroup4Teacher(id));
|
|
}
|
|
}
|