فهرست منبع

fix: 消息推送bug修复

zengweijie 2 سال پیش
والد
کامیت
44294834d2

+ 10 - 12
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/tenant/UserInformServiceImpl.java

@@ -76,18 +76,16 @@ public class UserInformServiceImpl implements UserInformService {
         }
 
         //关联的org需要对该org下的用户进行预警,并且需要用户的接收级别<=异常级别,这里我们用informLevel的id表示级别的递增
-        if (!CollectionUtils.isEmpty(org)) {
-            log.debug("users:{}", users);
-            List<SmsbSimpleUserCO> orgUserList = departmentUserService.listUserByInformLevel(tenant, org, informLevel.getId());
-            List<String> existedUserIdList = users.stream().map(KeycloakUserCO::getId).collect(Collectors.toList());
-            List<String> orgUserIdList = orgUserList.stream().map(SmsbSimpleUserCO::getUserId).distinct().collect(Collectors.toList());
-            orgUserIdList.removeAll(existedUserIdList);
-            log.debug("orgUserIdList:{}", orgUserIdList);
-            if (!CollectionUtils.isEmpty(orgUserIdList)) {
-                List<KeycloakUserCO> orgKeyCloakUserList = keycloakService.getUsersByIds(orgUserIdList);
-                log.debug("orgKeyCloakUserList:{}", orgKeyCloakUserList);
-                users.addAll(orgKeyCloakUserList);
-            }
+        log.debug("users:{}", users);
+        List<SmsbSimpleUserCO> orgUserList = departmentUserService.listUserByInformLevel(tenant, org, informLevel.getId());
+        List<String> existedUserIdList = users.stream().map(KeycloakUserCO::getId).collect(Collectors.toList());
+        List<String> orgUserIdList = orgUserList.stream().map(SmsbSimpleUserCO::getUserId).distinct().collect(Collectors.toList());
+        orgUserIdList.removeAll(existedUserIdList);
+        log.debug("orgUserIdList:{}", orgUserIdList);
+        if (!CollectionUtils.isEmpty(orgUserIdList)) {
+            List<KeycloakUserCO> orgKeyCloakUserList = keycloakService.getUsersByIds(orgUserIdList);
+            log.debug("orgKeyCloakUserList:{}", orgKeyCloakUserList);
+            users.addAll(orgKeyCloakUserList);
         }