提交保护暂停

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketEmailsServiceImpl.java

@@ -317,10 +317,14 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
 
 
         // 如果是开启保护 且 前端传了保护原因 -> 一并写入
-        if (Integer.valueOf(1).equals(dto.getHasProtect()) && !ObjectUtils.isEmpty(dto.getProtectReason())) {
-            wrapper.set(MarketEmailsEntity::getProtectReason, dto.getProtectReason());
+        if (Integer.valueOf(1).equals(dto.getHasProtect())) {
             wrapper.set(MarketEmailsEntity::getProtectTime, new Date());
+            if (!ObjectUtils.isEmpty(dto.getProtectReason())) {
+                wrapper.set(MarketEmailsEntity::getProtectReason, dto.getProtectReason());
+            }
         }
+
+
         // 如果是移除保护 -> 清空保护原因
         if (Integer.valueOf(0).equals(dto.getHasProtect())) {
             wrapper.set(MarketEmailsEntity::getProtectReason, null);
@@ -1013,6 +1017,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                     marketEmail.setHasProtect(marketOtherEmail.getHasProtect());
                     marketEmail.setProtectReason(marketOtherEmail.getProtectReason());
                     marketEmail.setProtectTime(marketOtherEmail.getProtectTime());
+                    marketEmail.setSuspendTime(marketOtherEmail.getSuspendTime());
                 }
 
                 //通过客户id写入企业关联邮箱