Merge remote-tracking branch 'origin/transaction_teacher' into transaction_teacher

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/EmployeeRoleEnum.java

@@ -6,7 +6,9 @@ import com.ym.mec.common.enums.BaseEnum;
  * 员工角色枚举
  */
 public enum EmployeeRoleEnum implements BaseEnum<String, EmployeeRoleEnum> {
-	TEAM_TEACHER("TEAM_TEACHER", "运营主管"), EDUCATION("EDUCATION", "乐团主管");
+	TEAM_TEACHER("TEAM_TEACHER", "运营主管"),
+	TRANSACTION("TRANSACTION", "衔接老师"),
+	EDUCATION("EDUCATION", "乐团主管");
 
 	private String code;
 

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -191,6 +191,8 @@ public class EmployeeController extends BaseController {
         }
         if(employeeRole == EmployeeRoleEnum.TEAM_TEACHER){
             return succeed(employeeService.findByRole("5",organIds));
+        }else if(employeeRole == EmployeeRoleEnum.TRANSACTION){
+            return succeed(employeeService.findByRole("58",organIds));
         }else {
             return succeed(employeeService.findByRole("4",organIds));
         }