Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -1,6 +1,8 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.QueryInfo;
 
 import io.swagger.annotations.Api;
@@ -28,9 +30,6 @@ import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherMusicClassQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("teacher")
@@ -50,6 +49,8 @@ public class TeacherController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private SubjectDao subjectDao;
+	@Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation(value = "修改教师个人中心信息")
     @PostMapping("/update")
@@ -182,4 +183,24 @@ public class TeacherController extends BaseController {
 		teacherService.realNameAuthentication(user.getId(), realName, idcardNo, idcardFrontImg, idcardBackImg, idcardHandImg);
 		return succeed();
 	}
+
+    @ApiOperation(value = "获取教务人员")
+    @GetMapping("/findEducationUsers")
+    public HttpResponseResult findEducationUsers(Integer 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() + "";
+            }
+            if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
+                organIds = organIds + "," + teacher.getFlowOrganRange();
+            }
+        }
+        return succeed(employeeService.findByRole("4,5",organIds));
+    }
 }