From 2c881e0417c3469471d44fe8302d73df486399ca Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Tue, 30 Jul 2024 10:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/alarm/monitor/listener/AlarmListener.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
index f69399e..cff87ff 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
@@ -39,14 +39,14 @@ public class AlarmListener implements IQueueConsume {
             messageService.webAppMessage(alarm);
         }
 
-        // 步骤4.微信公众号发送
-        if(ObjectUtil.isNotEmpty(alarm.getIsWxMessage()) && alarm.getIsWxMessage() == 0){
-            messageService.weChatMessage(alarm);
-        }
-
         // 步骤3.短信推送
         if(ObjectUtil.isNotEmpty(alarm.getIsShortMessage()) && alarm.getIsShortMessage() == 0){
             messageService.shortMessage(alarm);
         }
+
+        // 步骤4.微信公众号发送
+        if(ObjectUtil.isNotEmpty(alarm.getIsWxMessage()) && alarm.getIsWxMessage() == 0){
+            messageService.weChatMessage(alarm);
+        }
     }
 }
\ No newline at end of file