Эх сурвалжийг харах

Merge branch 'master_fix' of xiongzhu/raex_back into master

wangqifan 2 жил өмнө
parent
commit
70bfc2c681

+ 3 - 2
src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -287,8 +287,9 @@ public class DomainOrderService {
         }
 //        domain = domain.replaceAll("[^a-zA-Z0-9\\u4E00-\\u9FA5]", "");
         Pageable pageable = PageRequest.of(0, 3, Sort.by("createdAt").descending());
-        List<DomainOrder> used = domainOrderRepo.searchUsedDomain("%" + domain + "%", OrderStatus.CANCELLED, pageable)
-                                                .getContent();
+        List<DomainOrder> used = new ArrayList<>();
+        used.addAll(domainOrderRepo.searchUsedDomain("%" + domain + "%", OrderStatus.CANCELLED, pageable)
+                              .getContent());
         DomainOrder first = domainOrderRepo
                 .findFirstByDomainNameAndOrderStatus(domain + ".nft", OrderStatus.FINISH);
         if (first != null) {