|
@@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @Author Joburgess
|
|
@@ -189,13 +186,19 @@ public class EmployeeController extends BaseController {
|
|
|
}else{
|
|
|
organIds = organId.toString();
|
|
|
}
|
|
|
- if(employeeRole == EmployeeRoleEnum.TEAM_TEACHER){
|
|
|
- return succeed(employeeService.findByRole("5",organIds));
|
|
|
+ HashMap<String, Object> map = new HashMap<>();
|
|
|
+ if(employeeRole == null){
|
|
|
+ map.put("TEAM_TEACHER",employeeService.findByRole("5",organIds));
|
|
|
+ map.put("TRANSACTION",employeeService.findByRole("58",organIds));
|
|
|
+ map.put("EDUCATION",employeeService.findByRole("4",organIds));
|
|
|
+ }else if(employeeRole == EmployeeRoleEnum.TEAM_TEACHER){
|
|
|
+ map.put("TEAM_TEACHER",employeeService.findByRole("5",organIds));
|
|
|
}else if(employeeRole == EmployeeRoleEnum.TRANSACTION){
|
|
|
- return succeed(employeeService.findByRole("58",organIds));
|
|
|
+ map.put("TRANSACTION",employeeService.findByRole("58",organIds));
|
|
|
}else {
|
|
|
- return succeed(employeeService.findByRole("4",organIds));
|
|
|
+ map.put("EDUCATION",employeeService.findByRole("4",organIds));
|
|
|
}
|
|
|
+ return succeed(map);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取教务老师")
|