fengji 修复邮件

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoSendMsgServiceImpl.java

@@ -48,24 +48,13 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
      */
     @Override
     public void platformSendToAll(Integer receiveUserId, String email, String phone, Object[] objs) {
-        Map<Integer, String> sendPar = new HashMap<>();
+
         if (Objects.isNull(receiveUserId)) {
             return;
         }
 
-        if (StringUtils.isNotBlank(phone)) {
-            sendPar.put(receiveUserId, phone);
-            log.info("platformSendToAll>>> receiveUserId {} phone {} objs {} sendPar {}", receiveUserId, phone, objs, sendPar);
-            sysMessageService.batchSendMessage(-1, MessageSenderPluginContext.MessageSender.AWSMS,
-                                               PLATFORM_ALL_MSG_ENUM.get(MessageSenderPluginContext.MessageSender.AWSMS),
-                                               sendPar, null, 0, null,
-                                               "SYSTEM", objs);
-        }
-        try {
-            Thread.sleep(3000);
-        } catch (Exception e) { }
-
         if (StringUtils.isNotBlank(email)) {
+            Map<Integer, String> sendPar = new HashMap<>();
             sendPar.put(receiveUserId, email);
             log.info("platformSendToAll>>> receiveUserId {} email {} objs {} sendPar {}", receiveUserId, email, objs, sendPar);
             sysMessageService.batchSendMessage(-1, MessageSenderPluginContext.MessageSender.EMAIL,
@@ -74,6 +63,15 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
                     "SYSTEM", objs);
         }
 
+        if (StringUtils.isNotBlank(phone)) {
+            Map<Integer, String> sendPar2 = new HashMap<>();
+            sendPar2.put(receiveUserId, phone);
+            log.info("platformSendToAll>>> receiveUserId {} phone {} objs {} sendPar {}", receiveUserId, phone, objs, sendPar2);
+            sysMessageService.batchSendMessage(-1, MessageSenderPluginContext.MessageSender.AWSMS,
+                    PLATFORM_ALL_MSG_ENUM.get(MessageSenderPluginContext.MessageSender.AWSMS),
+                    sendPar2, null, 0, null,
+                    "SYSTEM", objs);
+        }
     }
 
 }