fix:

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java

@@ -58,6 +58,11 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
     //子女关联的老人id
     //子女关联的老人id
     private List<String> elderIdList;
     private List<String> elderIdList;
 
 
+    /**
+     * 通知家属状态 0 未通知 1 已通知
+     */
+    private String noticeStatus;
+
 
 
 
 
 }
 }

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

@@ -120,6 +120,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         String[] split = elderId.split(",");
         String[] split = elderId.split(",");
         PlatAlarmRecordQueryDTO data = dto.getData();
         PlatAlarmRecordQueryDTO data = dto.getData();
         data.setElderIdList(Arrays.asList(split));
         data.setElderIdList(Arrays.asList(split));
+        data.setNoticeStatus(CommonEnum.YES.getValue());
         return page(dto);
         return page(dto);
     }
     }
 
 
@@ -139,6 +140,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                         qw.or().apply("find_in_set('" + elderId + "',elder_ids)");
                         qw.or().apply("find_in_set('" + elderId + "',elder_ids)");
                     }
                     }
                 })
                 })
+                .eq(StringUtils.isNotBlank(param.getNoticeStatus()),PlatAlarmRecord::getNoticeStatus,param.getNoticeStatus())
                 .orderByDesc(BaseEntity::getCreateDate)
                 .orderByDesc(BaseEntity::getCreateDate)
                 ;
                 ;
     }
     }
@@ -304,6 +306,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
      */
      */
     private void noticeByChannel(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord, Set<String> phoneSet,Set<String> emailSet, List<SendTypeEnum> notifyChannelList) {
     private void noticeByChannel(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord, Set<String> phoneSet,Set<String> emailSet, List<SendTypeEnum> notifyChannelList) {
         String notifyChannel = alarmConfig.getNotifyChannel();
         String notifyChannel = alarmConfig.getNotifyChannel();
+        if(StringUtils.isEmpty(notifyChannel)){
+            return;
+        }
         String[] split = notifyChannel.split(",");
         String[] split = notifyChannel.split(",");
         for (String sendType : split) {
         for (String sendType : split) {
             SendTypeEnum sendTypeEnum = SendTypeEnum.getByValue(sendType);
             SendTypeEnum sendTypeEnum = SendTypeEnum.getByValue(sendType);