log

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -379,7 +379,7 @@ public class ShopServiceImpl implements ShopService {
                     .map(UserShop::getShopId).collect(Collectors.toList());
         }
 
-        List<String> shopIds = null;
+        List<String> shopIds = new ArrayList<>();
         if (shopFilterDto.getBindIp() == 0) {
             shopIds = allIds;
 
@@ -400,7 +400,7 @@ public class ShopServiceImpl implements ShopService {
             }
         }
 
-        amount = amount > 100 ? 100 : amount;
+        amount = Math.min(amount, 100);
         Pageable pageable = PageRequest.of(pageNum, amount);
         // 根据商铺ids 与 过滤条件 得到商铺
         Page<Shop> shops = getShopsByFilter(shopFilterDto, shopIds, pageable);
@@ -408,7 +408,7 @@ public class ShopServiceImpl implements ShopService {
         ShopPageResultDto<ShopResultDto> shopPageResultDto = new ShopPageResultDto<>();
         if (shops != null && shops.getNumberOfElements() >= 1) {
             List<ShopResultDto> shopResultDtos = new ArrayList<>();
-            shops.getContent().stream().forEach(
+            shops.getContent().forEach(
                     x -> {
                         IpResource ipResource = ipResourceRepository.findFirstByShopIdsIsAndIsDeleted(x.getShopId(), false);
                         // 如果 ip资源非空 且 addr 也非空
@@ -476,7 +476,6 @@ public class ShopServiceImpl implements ShopService {
     public ShopSummary getShopSummary(String username) {
         Account account = accountRepository.findByName(username).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
 
-
         ShopSummary shopSummary = new ShopSummary();
         List<String> allShopIds = userShopRepository.findByUsername(username).stream()
                 .map(UserShop::getShopId).collect(Collectors.toList());