过滤bug

src/main/java/com/edgec/browserbackend/browser/dto/ShopFilterDto.java

@@ -7,7 +7,7 @@ public class ShopFilterDto {
     private String shopName;
     private String IpRegion;
     private String shopAccount;
-    private boolean bindIp;
+    private int bindIp;
 
     public String getShopAccount() {
         return shopAccount;
@@ -33,11 +33,11 @@ public class ShopFilterDto {
         this.shopName = shopName;
     }
 
-    public boolean isBindIp() {
+    public int getBindIp() {
         return bindIp;
     }
 
-    public void setBindIp(boolean bindIp) {
+    public void setBindIp(int bindIp) {
         this.bindIp = bindIp;
     }
 }

src/main/java/com/edgec/browserbackend/browser/repository/UserShopRepository.java

@@ -10,6 +10,7 @@ public interface UserShopRepository extends MongoRepository<UserShop, String>, U
     List<UserShop> findByUsernameAndIpIdIsNull(String username);
     UserShop findByUsernameAndShopId(String username, String shopId);
     UserShop findByShopId(String shopId);
+    List<UserShop> findByUsernameAndGroupId(String username, String groupId);
     List<UserShop> findByUsernameAndGroupIdAndIpIdIsNull(String username, String groupId);
     List<UserShop> findByUsernameAndGroupIdAndIpIdIsNotNull(String username, String groupId);
     List<UserShop> findByUsernameAndShopIdIn(String username, List<String> shopIds);

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

@@ -359,14 +359,20 @@ public class ShopServiceImpl implements ShopService {
         }
         List<String> shopIds = new ArrayList<>();
         if (groupId.equals("-1")) {
-            if (shopFilterDto.isBindIp())
+            if (shopFilterDto.getBindIp() == 0)
+                shopIds = userShopRepository.findByUsername(username).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else if (shopFilterDto.getBindIp() == 1)
                 shopIds = userShopRepository.findByUsernameAndIpIdIsNotNull(username).stream().
                         map(x -> x.getShopId()).collect(Collectors.toList());
             else
                 shopIds = userShopRepository.findByUsernameAndIpIdIsNull(username).stream().
                         map(x -> x.getShopId()).collect(Collectors.toList());
         } else {
-            if (shopFilterDto.isBindIp())
+            if (shopFilterDto.getBindIp() == 0)
+                shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else if (shopFilterDto.getBindIp() == 1)
                 shopIds = userShopRepository.findByUsernameAndGroupIdAndIpIdIsNotNull(username, groupId).stream().
                         map(x -> x.getShopId()).collect(Collectors.toList());
             else