wangliang 9 달 전
부모
커밋
66e9ef7145
1개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmServiceImpl.java

+ 6 - 5
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmServiceImpl.java

@@ -389,7 +389,8 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
             Long examEndTime = tbCrmParam.getExamEndTime();
             Long productId = tbCrmParam.getProductId();
 
-            if (examStartTime > 0 && examEndTime > 0 && examEndTime < examStartTime) {
+            if (Objects.nonNull(examStartTime) && Objects.nonNull(examEndTime) && examStartTime > 0 && examEndTime > 0
+                    && examEndTime < examStartTime) {
                 throw ExceptionResultEnum.ERROR.exception("考试结束时间不能小于考试开始时间");
             }
             TBCrm checkCrmNo = this.getOne(
@@ -415,10 +416,10 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
                 tbCrm.setBeginTime(beginTime);
                 tbCrm.setCrmUserId(crmUserId);
                 tbCrm.setCustomId(customId);
-                if (examStartTime > 0) {
+                if (Objects.nonNull(examStartTime) && examStartTime > 0) {
                     tbCrm.setExamStartTime(examStartTime);
                 }
-                if (examEndTime > 0) {
+                if (Objects.nonNull(examEndTime) && examEndTime > 0) {
                     tbCrm.setExamEndTime(examEndTime);
                 }
                 tbCrm.setProductId(productId);
@@ -440,10 +441,10 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
                 dbTBCrm.setBeginTime(beginTime);
                 dbTBCrm.setCrmUserId(crmUserId);
                 dbTBCrm.setCustomId(customId);
-                if (examStartTime > 0) {
+                if (Objects.nonNull(examStartTime) && examStartTime > 0) {
                     dbTBCrm.setExamStartTime(examStartTime);
                 }
-                if (examEndTime > 0) {
+                if (Objects.nonNull(examEndTime) && examEndTime > 0) {
                     dbTBCrm.setExamEndTime(examEndTime);
                 }
                 dbTBCrm.setProductId(productId);