wangqifan преди 3 години
родител
ревизия
634d4eacd7
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      src/main/java/com/izouma/nineth/domain/Asset.java

+ 7 - 1
src/main/java/com/izouma/nineth/domain/Asset.java

@@ -245,6 +245,12 @@ public class Asset extends CollectionBaseEntity {
     private boolean metaPutOn;
 
     public static Asset create(Collection collection, User user) {
+        Set<Tag> tags;
+        if (collection.getTags() != null) {
+            tags = new HashSet<>(collection.getTags());
+        } else {
+            tags = new HashSet<>();
+        }
         return Asset.builder()
                 .userId(user.getId())
                 .collectionId(collection.getId())
@@ -270,7 +276,7 @@ public class Asset extends CollectionBaseEntity {
                 .holdDays(collection.getHoldDays())
                 .oldHoldDays(collection.getHoldDays())
                 .source(AssetSource.OFFICIAL)
-                .tags(new HashSet<>(collection.getTags()))
+                .tags(tags)
                 .prefixName(collection.getPrefixName())
                 .empower(collection.getEmpower())
                 .companyId(collection.getCompanyId())