更新时添加更新时间字段的更新

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;
 }

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);

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>