From 0aa28d0b9e4128ca0a192dc5990ae6c1d0f74f8e Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 24 Aug 2023 17:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/core/model/mailGather/EmailMaintainVo.java   | 3 +++
 .../src/main/java/com/dxhy/core/task/SnEmailGatherTask.java    | 2 +-
 .../main/resources/mapper/mailGather/EmailMaintainMapper.xml   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java
index 6d31465c..9555324d 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java
@@ -1,6 +1,7 @@
 package com.dxhy.core.model.mailGather;
 
 import com.dxhy.core.model.CommonDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,6 +33,8 @@ public class EmailMaintainVo  extends CommonDTO {
 
     public String createUser;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date modifyTime;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
index 4fd83721..3e5f7d77 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
@@ -254,7 +254,7 @@ public class SnEmailGatherTask {
             throw new RuntimeException(e);
         }finally {
             //更新uid信息
-            if (uids.isEmpty() ||uids.indexOf(uid)>uids.indexOf(maintainVo.getEmailUid())){
+            if (StringUtils.isNotBlank(uid) && (uids.isEmpty() ||uids.indexOf(uid)>uids.indexOf(maintainVo.getEmailUid()))){
                 EmailMaintainVo emailMaintainVo = new EmailMaintainVo();
                 emailMaintainVo.setId(maintainVo.getId());
                 emailMaintainVo.setEmailUid(uid);
diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
index f47f3aa1..19eaa752 100644
--- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
@@ -152,7 +152,7 @@
             <if test="emailUid != null and emailUid != ''">
                 email_uid = #{emailUid},
             </if>
-            <if test="modifyTime != null and modifyTime != ''">
+            <if test="modifyTime != null">
                 modify_time = #{modifyTime},
             </if>
         </set>