Merge branch 'dev' into fix_sleep

server-common/src/main/java/com/makeit/utils/msg/sender/WxSpSender.java

@@ -44,7 +44,7 @@ public class WxSpSender implements IMsgSender{
     public void send(MsgSendDTO msgDTO) {
 
         List<MsgSendDTO.ReceiverInfo> receiverInfos = msgDTO.getReceiverInfos();
-        if (CollUtil.isNotEmpty(receiverInfos)) {
+        if (CollUtil.isEmpty(receiverInfos)) {
             return;
         }
         String content = msgDTO.getOriContent();

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -347,10 +347,14 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             return list;
         }
         childInfoList.forEach(c -> {
+            if (StrUtil.isBlank(c.getWeChatOpenid())) {
+                return;
+            }
             MsgSendDTO.ReceiverInfo receiverInfo = new MsgSendDTO.ReceiverInfo();
             receiverInfo.setRegionName(alarmRecord.getRegionName());
             receiverInfo.setName(c.getName());
             receiverInfo.setWeChatOpenid(c.getWeChatOpenid());
+            list.add(receiverInfo);
         });
         return list;
     }