浏览代码

BUG修复

wangliang 1 年之前
父节点
当前提交
2cdcb9e26f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudentLog.java

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudentLog.java

@@ -162,7 +162,7 @@ public class TEExamStudentLog implements Serializable {
             if (Objects.isNull(currentIp) || Objects.equals(currentIp.trim(), "")) {
             if (Objects.isNull(currentIp) || Objects.equals(currentIp.trim(), "")) {
                 currentIp = ip;
                 currentIp = ip;
                 continue;
                 continue;
-            } else if (Objects.nonNull(currentIp) && !Objects.equals(currentIp.trim(), "") && !Objects.equals(currentIp, ip)) {
+            } else if (Objects.nonNull(currentIp) && Objects.nonNull(ip) && !Objects.equals(currentIp.trim(), "") && !Objects.equals(currentIp, ip)) {
                 if (!Objects.equals(teExamStudentLogList.get(i).getType(), ExamRecordStatusEnum.FINISHED.name())
                 if (!Objects.equals(teExamStudentLogList.get(i).getType(), ExamRecordStatusEnum.FINISHED.name())
                         || (Objects.equals(teExamStudentLogList.get(i).getType(), ExamRecordStatusEnum.FINISHED.name()) && Objects.nonNull(ip))) {
                         || (Objects.equals(teExamStudentLogList.get(i).getType(), ExamRecordStatusEnum.FINISHED.name()) && Objects.nonNull(ip))) {
                     teExamStudentLogList.get(i).setIpChange(true);
                     teExamStudentLogList.get(i).setIpChange(true);