解决学生修改信息报错

src/main/java/com/xjrsoft/module/student/service/impl/StudentChangeRecordServiceImpl.java

@@ -7,7 +7,6 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
-import com.xjrsoft.common.enums.LearnStatusEnum;
 import com.xjrsoft.common.enums.RollModalityEnum;
 import com.xjrsoft.common.enums.RoomApplicantTypeEnum;
 import com.xjrsoft.common.enums.StudentChangeTypeEnum;
@@ -33,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
 * @title: 学生异动记录表
@@ -173,7 +173,7 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
     @Override
     public Boolean insertDataByStudentUpdate(BaseStudentSchoolRoll beforeRoll, BaseStudentSchoolRoll afterRoll) {
         List<StudentChangeRecord> insertList = new ArrayList<>();
-        if(!beforeRoll.getClassId().equals(afterRoll.getClassId())){
+        if(!Objects.equals(beforeRoll.getClassId(), afterRoll.getClassId())){
             BaseClass afterClass = classService.getById(afterRoll.getClassId());
             BaseClass beforeClass = classService.getById(beforeRoll.getClassId());
 
@@ -193,7 +193,7 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
             insertList.add(record);
         }
 
-        if(!beforeRoll.getArchivesStatus().equals(afterRoll.getArchivesStatus())){
+        if(!Objects.equals(beforeRoll.getArchivesStatus(), afterRoll.getArchivesStatus())){
             StudentChangeRecord record = new StudentChangeRecord() {{
                 setAfterData(ArchivesStatusEnum.fromCode(afterRoll.getArchivesStatus()));
                 setAfterDataCode(afterRoll.getArchivesStatus());
@@ -209,7 +209,7 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
             }};
             insertList.add(record);
         }
-        if(!beforeRoll.getStudentType().equals(afterRoll.getStudentType())){
+        if(!Objects.equals(beforeRoll.getStudentType(), afterRoll.getStudentType())){
             StudentChangeRecord record = new StudentChangeRecord() {{
                 setAfterData(StudentTypeEnum.fromCode(afterRoll.getStudentType()));
                 setAfterDataCode(afterRoll.getStudentType());
@@ -226,7 +226,7 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
             insertList.add(record);
         }
 
-        if(!beforeRoll.getStduyStatus().equals(afterRoll.getStduyStatus())){
+        if(!Objects.equals(beforeRoll.getStduyStatus(), afterRoll.getStduyStatus())){
             StudentChangeRecord record = new StudentChangeRecord() {{
                 setAfterData(StudyStatusEnum.fromCode(afterRoll.getStduyStatus()));
                 setAfterDataCode(afterRoll.getStduyStatus());
@@ -243,7 +243,7 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
             insertList.add(record);
         }
 
-        if(!beforeRoll.getLearnStatus().equals(afterRoll.getLearnStatus())){
+        if(!Objects.equals(beforeRoll.getLearnStatus(), afterRoll.getLearnStatus())){
             StudentChangeRecord record = new StudentChangeRecord() {{
                 setAfterData(RollModalityEnum.fromCode(afterRoll.getLearnStatus()));
                 setAfterDataCode(afterRoll.getLearnStatus());