xiongzhu 3 lat temu
rodzic
commit
58d6f26aa3

+ 9 - 3
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -179,6 +179,9 @@ public class AssetService {
                 .assetId(id)
                 .number(asset.getNumber())
                 .build();
+        if (asset.getTags() != null) {
+            collection.getTags().addAll(asset.getTags());
+        }
         collectionRepo.save(collection);
         asset.setPublicShow(true);
         asset.setPublicCollectionId(collection.getId());
@@ -254,6 +257,9 @@ public class AssetService {
                 .assetId(id)
                 .number(asset.getNumber())
                 .build();
+        if (asset.getTags() != null) {
+            collection.getTags().addAll(asset.getTags());
+        }
         collectionRepo.save(collection);
         asset.setPublicShow(true);
         asset.setConsignment(true);
@@ -598,7 +604,7 @@ public class AssetService {
         assetRepo.save(asset);
     }
 
-//    @Cacheable(cacheNames = "fmaa", key = "#userId+'#'+#mintActivityId+'#'+#pageable.hashCode()")
+    //    @Cacheable(cacheNames = "fmaa", key = "#userId+'#'+#mintActivityId+'#'+#pageable.hashCode()")
     public PageWrapper<Asset> findMintActivityAssetsWrap(Long userId, Long mintActivityId, Pageable pageable) {
         return PageWrapper.of(findMintActivityAssets(userId, mintActivityId, pageable));
     }
@@ -612,8 +618,8 @@ public class AssetService {
             if (tags.isEmpty()) return new PageImpl<>(Collections.emptyList());
             return assetRepo.findAll((Specification<Asset>) (root, query, criteriaBuilder) ->
                     query.distinct(true).where(criteriaBuilder.equal(root.get("userId"), userId),
-                            criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
-                            root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
+                                    criteriaBuilder.equal(root.get("status"), AssetStatus.NORMAL),
+                                    root.join("tags").get("id").in(tags.stream().map(Tag::getId).toArray()))
                             .getRestriction(), pageable);
         } else {
             return assetRepo.findByUserIdAndStatusAndNameLike(userId, AssetStatus.NORMAL,