From 0c38056604bbcbf5cb7abc00f76f39b6b6fd4e4d Mon Sep 17 00:00:00 2001
From: "andly.pan" <andly.pan@estsh.com>
Date: Mon, 10 Jan 2022 18:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java    | 2 +-
 .../cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
index 9689a0b..20ac801 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
@@ -40,7 +40,7 @@ public class PlanFeedback extends BaseAPS {
 
     @Column(name="TOP_ORDER_ID")
     @ApiParam(value ="顶层订单")
-    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order")
+    @FieldAnnotation(popSearch = true, relation = "Order")
     private Long topOrderId;
 
     @Column(name="STATUS")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java
index a7bcaf2..e049012 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.validator;
 import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation;
 import cn.estsh.i3plus.pojo.aps.model.TimeBlock;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -14,11 +15,13 @@ public class CalendarTimeValidator implements ConstraintValidator<CalendarTimeAn
 
     @Override
     public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
+        if(StringUtils.isEmpty(s)){
+            return true;
+        }
         for (String strTime : s.split(",")) {
             if (StringUtil.isEmpty(strTime)) {
                 continue;
             }
-
             String[] times = strTime.split("~");
             if (times.length == 1) {
                 try {