Merge branch '84-wb' into '84-integrate'

fix:小问题修复



1、用户信息去重

2、对象查询判空



See merge request !54

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/tenant/TenantCommonAttributeServiceImpl.java

@@ -59,7 +59,8 @@ public class TenantCommonAttributeServiceImpl extends ServiceImpl<TenantCommonAt
     @Cacheable(value = "msr:customer:tenantCommonAttribute")
     public TenantAttributeCO queryTenantAttribute(TenantAttributeCO attributeCO) {
         TenantAttributeCO co = new TenantAttributeCO();
-        BeanUtils.copyProperties(queryOne(attributeCO.getTenant() ,attributeCO.getAttributeKey()),co);
+        TenantCommonAttributeDO tenantCommonAttributeDO = queryOne(attributeCO.getTenant(), attributeCO.getAttributeKey());
+        if(Objects.nonNull(tenantCommonAttributeDO)){BeanUtils.copyProperties(tenantCommonAttributeDO,co);}
         return co;
     }
 

smsb-customer-manager-client/src/main/java/com/inspur/customer/object/tenant/InformAddresseeCO.java

@@ -28,35 +28,35 @@ public class InformAddresseeCO implements Serializable {
 
     public List<String> getEmailAddressees() {
         if (Boolean.TRUE.equals(informStrategy.getEmail())) {
-            return users.stream().map(KeycloakUserCO::getEmail).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            return users.stream().map(KeycloakUserCO::getEmail).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         }
         return Collections.emptyList();
     }
 
     public List<String> getWeChatAddressees() {
         if (Boolean.TRUE.equals(informStrategy.getWechat())) {
-            return users.stream().map(KeycloakUserCO::getWechat).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            return users.stream().map(KeycloakUserCO::getWechat).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         }
         return Collections.emptyList();
     }
 
     public List<String> getUserIds() {
         if (Boolean.TRUE.equals(informStrategy.getWechatApplet())) {
-            return users.stream().map(KeycloakUserCO::getId).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            return users.stream().map(KeycloakUserCO::getId).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         }
         return Collections.emptyList();
     }
 
     public List<String> getWeChatAppletAddressees() {
         if (Boolean.TRUE.equals(informStrategy.getWechatApplet())) {
-            return users.stream().map(KeycloakUserCO::getWechatAppletOpenId).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            return users.stream().map(KeycloakUserCO::getWechatAppletOpenId).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         }
         return Collections.emptyList();
     }
 
     public List<String> getPhoneAddressees() {
         if (Boolean.TRUE.equals(informStrategy.getNote())) {
-            return users.stream().map(KeycloakUserCO::getPhone).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            return users.stream().map(KeycloakUserCO::getPhone).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
         }
         return Collections.emptyList();
     }