|
|
@@ -299,7 +299,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
if (student == null) {
|
|
|
return CommonResult.fail("学生数据已失效,编辑失败!");
|
|
|
}
|
|
|
- if (!usr.equals("本科") || !usr.equals("专升本") || !usr.equals("专科")) {
|
|
|
+ if (!usr.getBatchValue().equals("本科") || !usr.getBatchValue().equals("专升本") || !usr.getBatchValue().equals("专科")) {
|
|
|
return CommonResult.fail("批次为本科或专升本或专科");
|
|
|
}
|
|
|
//region 学生信息
|
|
|
@@ -630,7 +630,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
return CommonResult.fail(st);
|
|
|
}
|
|
|
|
|
|
- if (!icr.equals("本科") || !icr.equals("专升本") || !icr.equals("专科")) {
|
|
|
+ if (!icr.getBatchValue().equals("本科") || !icr.getBatchValue().equals("专升本") || !icr.getBatchValue().equals("专科")) {
|
|
|
return CommonResult.fail("批次为本科或专升本或专科");
|
|
|
}
|
|
|
WelcomeStudent ws = welcomeStudentService.getDataByIdcardOrNum(icr.getAdmissNum(), icr.getCardId());
|