zouxuan преди 4 години
родител
ревизия
eafaa1b44f
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

+ 3 - 1
mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -53,7 +53,9 @@ public class ReplacementInstrumentActivityController extends BaseController {
             replacementInstrumentActivity = new ReplacementInstrumentActivity();
             replacementInstrumentActivity.setUserId(user.getId());
             replacementInstrumentActivity.setClasses(student.getCurrentClass());
-            replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            if(student.getCurrentGradeNum() != null){
+                replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            }
             replacementInstrumentActivity.setCooperationOrganId(cooperationOrganId);
             replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
             replacementInstrumentActivity.setMobileNo(user.getPhone());