店铺bug

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

@@ -223,7 +223,7 @@ public class ShopServiceImpl implements ShopService {
         Shop shop = shopRepository.findById(shopId).orElse(null);
         if (shop == null)
             throw new ClientRequestException(BrowserErrorCode.SHOPNOTEXIST);
-        IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(shop.getShopId(), false);
+        IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(shop.getShopId(), false);
         if (ipResource != null) {
             ipResource.setShopName(null);
             ipResource.setShopId(null);
@@ -330,7 +330,7 @@ public class ShopServiceImpl implements ShopService {
         if (shop == null) {
             throw new ClientRequestException(BrowserErrorCode.SHOPNOTEXIST);
         }
-        IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(shopId, false);
+        IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(shopId, false);
         if (ipResource == null)
             throw new ClientRequestException(BrowserErrorCode.IPNOTEXIST);
         String group = userShopRepository.findByUsernameAndShopId(username, shop.getShopId()).getGroupId();
@@ -376,7 +376,7 @@ public class ShopServiceImpl implements ShopService {
                 List<String> allIds = userShopRepository.findByUsername(username).stream()
                         .map(x -> x.getShopId()).collect(Collectors.toList());
                 for (String id:allIds) {
-                    IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(id, false);
+                    IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(id, false);
                     if (ipResource == null)
                         shopIds.add(id);
                 }
@@ -395,7 +395,7 @@ public class ShopServiceImpl implements ShopService {
                 List<String> allIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream()
                         .map(x -> x.getShopId()).collect(Collectors.toList());
                 for (String id:allIds) {
-                    IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(id, false);
+                    IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(id, false);
                     if (ipResource == null)
                         shopIds.add(id);
                 }
@@ -419,7 +419,7 @@ public class ShopServiceImpl implements ShopService {
         logger.error("shops.size" + shops.getNumberOfElements());
         logger.error("shops.content.size " + shops.getContent().size());
         shops.getContent().stream().forEach(x -> {
-            IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(x.getShopId(), false);
+            IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(x.getShopId(), false);
             if (ipResource == null)
                 ipResource = new IpResource();
             String group1 = userShopRepository.findByUsernameAndShopId(username, x.getShopId()).getGroupId();
@@ -453,7 +453,7 @@ public class ShopServiceImpl implements ShopService {
         List<String> unbind = new ArrayList<>();
         if (allShopIds != null && allShopIds.size() > 0) {
             for (String id:allShopIds) {
-                IpResource ipResource = ipResourceRepository.findByShopIdAndIsDeleted(id, false);
+                IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(id, false);
                 if (ipResource == null) {
                     unbind.add(id);
                 }