Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1420,8 +1420,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		if (CollectionUtils.isEmpty(result)){
 			return new ArrayList<>();
 		}
-		List<String> tags = result.stream().map(SubjectListResultDTO::getTagId).distinct().collect(Collectors.toList());
-		result = result.stream().filter(item -> !tags.contains(item.getTagId())).collect(Collectors.toList());
+		result = result.stream().distinct().collect(Collectors.toList());
 		return result;
 	}
 

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFootBarDTO.java

@@ -105,4 +105,6 @@ public class CustomerFootBarDTO implements Serializable {
      * 浮起时图标
      */
     private String floatIconPath;
+
+    private String customerId;
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java

@@ -44,7 +44,7 @@ public class CustomerFootBarFormDTO {
     @NotBlank(message = "FootBar的ID不能为空", groups = { UpdateFootBarGroup.class, FootBarDetailGroup.class, UpdateDisplayStatusGroup.class, DeleteFootbarsGroup.class })
     private String id;
 
-    @NotBlank(message = "客户ID不能为空", groups = { CreateFootBarGroup.class, AddDefaultFootbars4Customer.class, ListFootBarGroup4Oper.class })
+    @NotBlank(message = "客户ID不能为空", groups = { CreateFootBarGroup.class, AddDefaultFootbars4Customer.class, ListFootBarGroup4Oper.class , DeleteFootbarsGroup.class})
     private String customerId;
 
     // 哪一个端:gov,resi
@@ -54,7 +54,7 @@ public class CustomerFootBarFormDTO {
     @NotBlank(message = "名称不能为空", groups = { CreateFootBarGroup.class, UpdateFootBarGroup.class })
     private String barName;
 
-    @NotBlank(message = "key不能为空", groups = { CreateFootBarGroup.class })
+    @NotBlank(message = "key不能为空", groups = { CreateFootBarGroup.class , DeleteFootbarsGroup.class})
     private String barKey;
 
     @NotBlank(message = "页面标题不能为空", groups = { CreateFootBarGroup.class, UpdateFootBarGroup.class })