Merge branch 'hotfix-ip-list' into 'master'

主账号查询不到子账号店铺绑定的IP

See merge request !242

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

@@ -961,6 +961,8 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndBind(username, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, false);
+                    // 子账户店铺已绑定的IP也要查询出来
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, true));
                 }
                 break;
             case 2:
@@ -969,6 +971,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 2, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, true));
                 }
                 break;
             case 3:
@@ -977,6 +980,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 1, false, false);
                 } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, true));
                 }
                 break;
             case 4:
@@ -992,10 +996,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                                                   .stream()
                                                   .filter(x -> x.getValidTime() > Instant.now().toEpochMilli())
                                                   .collect(Collectors.toList());
-                if (!isParent)
+                if (!isParent) {
                     notUsed = ipResourceRepository.findByOwnerAndStatusInAndIsDeletedAndBind(username, Arrays.asList(0, 2, 4, 8), false, false);
-                else
+                } else {
                     notUsed = ipResourceRepository.findByOwnerInAndStatusInAndIsDeletedAndBind(accountNameList, Arrays.asList(0, 2, 4, 8), false, false);
+                    ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusInAndIsDeletedAndBind(accountNameList, Arrays.asList(0, 2, 4, 8), false, true));
+                }
                 break;
         }
         if (CollectionUtils.isNotEmpty(ipResources))