ソースを参照

版权市场去重

lidongze 3 年 前
コミット
7aa33296e8

+ 7 - 8
src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -113,15 +113,14 @@ public class CollectionService {
                             return criteriaBuilder.and(and.toArray(new Predicate[0]));
                         });
             }
-            if (query.containsKey("distinct")) {
-                query.remove("distinct");
-                specification = specification.and((Specification<Collection>) (root, criteriaQuery, criteriaBuilder) -> {
-                    criteriaQuery.groupBy(root.get("name"));
-                    return criteriaBuilder.and();
-                });
-            }
         }
-
+        if (query.containsKey("distinct")) {
+            query.remove("distinct");
+            specification = specification.and((Specification<Collection>) (root, criteriaQuery, criteriaBuilder) -> {
+                criteriaQuery.groupBy(root.get("name"));
+                return criteriaBuilder.and();
+            });
+        }
         if (query.containsKey("rarityLabel")) {
             String rarityLabel = String.valueOf(query.get("rarityLabel"));
             query.remove("rarityLabel");