From 273484b62e435f90cd2f60dbeb9be0cb496c4d67 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Sat, 15 Jan 2022 20:19:37 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=AD=A3=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flyfish/framework/dict/config/DictionaryProcessor.java  | 1 +
 .../main/java/com/flyfish/framework/file/domain/Attachment.java | 2 ++
 .../java/com/flyfish/framework/beans/meta/BeanProperty.java     | 1 +
 3 files changed, 4 insertions(+)

diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
index fea6cb0..b7cfd48 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
+++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
@@ -56,6 +56,7 @@ public class DictionaryProcessor implements InitializingBean {
                     .map(field -> field.getAnnotation(DictValue.class))
                     .filter(annotation -> null != annotation && StringUtils.isNotBlank(annotation.value()) &&
                             BlankEnum.class != annotation.enumType())
+                    .distinct(DictValue::enumType)
                     // 查找是否存在，不存在插入，存在无视
                     .flatMap(annotation -> dictionaryService
                             .getByCode(annotation.value())
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java b/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
index a0053bd..74ab193 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
+++ b/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
@@ -1,5 +1,6 @@
 package com.flyfish.framework.file.domain;
 
+import com.flyfish.framework.annotations.Property;
 import com.flyfish.framework.domain.base.AuditDomain;
 import lombok.*;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -10,6 +11,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Property(key = "name", value = "附件名称")
 public class Attachment extends AuditDomain {
 
     /**
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
index 7d05e0f..bc43247 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
@@ -222,6 +222,7 @@ public class BeanProperty {
                     Class<?> elementClass = ReflectionUtils.getGenericType(field).orElse(Object.class);
                     if (property.isAttachment(elementClass)) {
                         property.prop("attachment", true);
+                        break;
                     }
                     annotations
                             .as(SubBean.class)