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)