filter

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

@@ -7,6 +7,7 @@ public class ShopFilterDto {
     private String shopName;
     private String IpRegion;
     private String shopAccount;
+    private boolean bindIp;
 
     public String getShopAccount() {
         return shopAccount;
@@ -31,4 +32,12 @@ public class ShopFilterDto {
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
+
+    public boolean isBindIp() {
+        return bindIp;
+    }
+
+    public void setBindIp(boolean bindIp) {
+        this.bindIp = bindIp;
+    }
 }

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

@@ -7,9 +7,11 @@ import java.util.List;
 
 public interface UserShopRepository extends MongoRepository<UserShop, String>, UserShopRepositoryCustom {
     List<UserShop> findByUsername(String username);
+    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);
     List<UserShop> findByUsernameAndIpIdIsNotNull(String username);
     int countByUsernameAndIpIdIsNull(String username);

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

@@ -359,11 +359,19 @@ public class ShopServiceImpl implements ShopService {
         }
         List<String> shopIds = new ArrayList<>();
         if (groupId.equals("-1")) {
-            shopIds = userShopRepository.findByUsername(username).stream().
-                    map(x -> x.getShopId()).collect(Collectors.toList());
+            if (shopFilterDto.isBindIp())
+                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 {
-            shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
-                    map(x -> x.getShopId()).collect(Collectors.toList());
+            if (shopFilterDto.isBindIp())
+                shopIds = userShopRepository.findByUsernameAndGroupIdAndIpIdIsNotNull(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
+            else
+                shopIds = userShopRepository.findByUsernameAndGroupIdAndIpIdIsNull(username, groupId).stream().
+                        map(x -> x.getShopId()).collect(Collectors.toList());
         }
         Page<Shop> shops;
         if (shopFilterDto != null && StringUtils.isNotBlank(shopFilterDto.getIpRegion()))

src/main/java/com/edgec/browserbackend/common/utils/FileUtil.java

@@ -87,7 +87,7 @@ public class FileUtil {
             //得到指定的单元格
             Cell cell = row.getCell(0);;
             int size = 1;
-            for (int i = 1; i < rowLength; i++) {
+            for (int i = 2; i < rowLength; i++) {
                 row = sheet.getRow(i);
                 List<Object> rowvalue = new ArrayList<>();
                 size = 0;