diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java index 1ba560a..583f8f0 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java @@ -136,10 +136,10 @@ public class TrainingController { @Permission(codes = PermissionType.TRAINING_MANAGEMENT_ADD) @ApiOperation("教师端----添加实训成员时用:获取班级列表") @GetMapping("findClassNameList") - public ResultEntity>> findClassNameList(@ApiParam("专业Id") Integer majorId) { + public ResultEntity>> findClassNameList(@ApiParam("专业Id") String majorId) { JwtUser currentUser = TokenProvider.getJWTUser(request); List> mapList; - if (majorId == null || majorId == 0) { + if (majorId == null ) { mapList = TzApi.GetClassBySchoolIdForForeignExchangeTrading(currentUser); } else { mapList = TzApi.GetClassByMajorIdForForeignExchangeTrading(currentUser, majorId); diff --git a/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java b/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java index 3bcda3b..9fc0bea 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java @@ -27,7 +27,7 @@ public class TzApi { private final static String GET_CLASS = NEW_API_URL + "/server/account/findClassesBySchoolId.json"; private final static String GET_MAJOR = NEW_API_URL + "/server/account/findMajorsBySchoolId.json"; - private final static String GET_CLASS_BY_MAJOR = API_URL + "/Account/GetClassByMajorIdForForeignExchangeTrading"; + private final static String GET_CLASS_BY_MAJOR = NEW_API_URL + "/server/account/getClassListByMajorId.json"; private final static String GET_STUDENT_BY_ClALL = NEW_API_URL + "/server/account/getStudentsByClassId.json"; private final static String GET_STUDENT_BY_KEYWORD = API_URL + "/Account/GetStudentInfoByKeywordForForeignExchangeTrading"; private final static String PAGE_STUDENT_BY_KEYWORD = API_URL + "/Account/PagedListStudentInfoByClassIdForForeignExchangeTrading"; @@ -95,7 +95,7 @@ public class TzApi { return getDataFromApi(url, token); } - public static List> GetClassByMajorIdForForeignExchangeTrading(JwtUser user, int majorId) { + public static List> GetClassByMajorIdForForeignExchangeTrading(JwtUser user, String majorId) { String token = getToken(user); String url = GET_CLASS_BY_MAJOR + "?majorId=" + majorId; return getDataFromApi(url, token);