自定义专题配置校验bug修改

src/main/java/com/zzsn/event/service/impl/SubjectSimpleServiceImpl.java

@@ -140,17 +140,24 @@ public class SubjectSimpleServiceImpl implements SubjectSimpleService {
                 return false;
             }
             //判断时间范围是否增加(新时间范围完全包含旧时间范围 标识增加),增加则校验通过，反之不通过
+            Date today = new Date();
             Date timeEnable = subjectSimpleVO.getTimeEnable();
+            if (timeEnable == null) {
+                timeEnable = DateUtil.offsetMonth(firstOpenTime, -defaultAdvanceMonth);
+            }
             Date timeDisable = subjectSimpleVO.getTimeDisable();
+            if (timeDisable == null) {
+                timeDisable = today;
+            }
             Date oldTimeEnable = subjectDetailVO.getTimeEnable();
             if (oldTimeEnable == null) {
                 oldTimeEnable = DateUtil.offsetMonth(firstOpenTime, -defaultAdvanceMonth);
             }
             Date oldTimeDisable = subjectDetailVO.getTimeDisable();
             if (oldTimeDisable == null) {
-                oldTimeDisable = new Date();
+                oldTimeDisable = today;
             }
-            if (!((timeEnable != null && timeEnable.before(oldTimeEnable)) && (timeDisable != null && timeDisable.after(oldTimeDisable)))) {
+            if (!(!timeEnable.after(oldTimeEnable) && !timeDisable.before(oldTimeDisable))) {
                 return false;
             }
             //判断关键词配置是否变化