|
@@ -187,20 +187,18 @@ public class TeacherController extends BaseController {
|
|
|
@ApiOperation(value = "获取教务人员")
|
|
|
@GetMapping("/findEducationUsers")
|
|
|
public HttpResponseResult findEducationUsers(Integer userId){
|
|
|
- SysUser sysUser;
|
|
|
- if(userId == null){
|
|
|
- sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if (sysUser == null) {
|
|
|
- return failed("用户信息获取失败");
|
|
|
- }
|
|
|
- }else {
|
|
|
- sysUser = sysUserFeignService.queryUserById(userId);
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
+ if (sysUser == null) {
|
|
|
+ return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
}
|
|
|
String organIds = new String();
|
|
|
if (!sysUser.getIsSuperAdmin()) {
|
|
|
Teacher teacher = teacherService.get(sysUser.getId());
|
|
|
if (StringUtils.isEmpty(organIds)) {
|
|
|
- organIds = teacher.getOrganId() + "," + teacher.getFlowOrganRange();
|
|
|
+ organIds = teacher.getOrganId() + "";
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
|
|
|
+ organIds = organIds + "," + teacher.getFlowOrganRange();
|
|
|
}
|
|
|
}
|
|
|
return succeed(employeeService.findByRole("4,5",organIds));
|