fix: 发送通知时,选择一个根组织，通知一个用户通知了两次【原因：没有去除重复的组织ID、重复的用户ID】

@@ -33,7 +33,7 @@ public class YtAlarmNoticeController {
     private final YtNoticeService service;
     private final YtNoticeService service;
 
 
     @PostMapping("/alert")
     @PostMapping("/alert")
-    public void alermNotice(@RequestParam(value = "token", required = true) String token,
+    public void alertNotice(@RequestParam(value = "token", required = true) String token,
                             @RequestBody AlarmInfoDTO alarmInfo) {
                             @RequestBody AlarmInfoDTO alarmInfo) {
         Assert.notNull(token, "token cannot be null");
         Assert.notNull(token, "token cannot be null");
         Assert.notNull(alarmInfo, "alarm info cannot be null");
         Assert.notNull(alarmInfo, "alarm info cannot be null");

@@ -142,8 +142,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
     }
     }
     sysNotice.setCreator(currentUserId);
     sysNotice.setCreator(currentUserId);
     sysNotice.setSenderDate(LocalDateTime.now());
     sysNotice.setSenderDate(LocalDateTime.now());
-    int update =
-        baseMapper.update(
+    baseMapper.update(
             sysNotice,
             sysNotice,
             new LambdaQueryWrapper<SysNotice>()
             new LambdaQueryWrapper<SysNotice>()
                 .eq(SysNotice::getId, sysNoticeDTO.getId())
                 .eq(SysNotice::getId, sysNoticeDTO.getId())

@@ -17,7 +17,9 @@ import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -42,13 +44,15 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     if (ObjectUtils.isEmpty(collect)) {
     if (ObjectUtils.isEmpty(collect)) {
       return new ArrayList<>();
       return new ArrayList<>();
     } else {
     } else {
+      Set<String> clearList = new HashSet<>();
+      clearList.addAll(collect);
       return userOrganizationMappingMapper
       return userOrganizationMappingMapper
           .selectList(
           .selectList(
               new LambdaQueryWrapper<UserOrganizationMapping>()
               new LambdaQueryWrapper<UserOrganizationMapping>()
-                  .in(UserOrganizationMapping::getOrganizationId, collect))
+                  .in(UserOrganizationMapping::getOrganizationId, clearList))
           .stream()
           .stream()
-          .distinct()
           .map(UserOrganizationMapping::getUserId)
           .map(UserOrganizationMapping::getUserId)
+          .distinct()
           .collect(Collectors.toList());
           .collect(Collectors.toList());
     }
     }
   }
   }

@@ -16,7 +16,6 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
-import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;