Skip to content

B
browser-backend
Commit e0651649 authored by huangjiamin's avatar huangjiamin
Browse files
Options

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

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

See merge request !242
parents c69cbc93 b8b7eb72
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @ e0651649
...@@ -961,6 +961,8 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -961,6 +961,8 @@ public class IpResourceServiceImpl implements IpResourceService {
notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndBind(username, false, false); notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndBind(username, false, false);
} else { } else {
notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, false); notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, false);
// 子账户店铺已绑定的IP也要查询出来
ipResources.addAll(ipResourceRepository.findByOwnerInAndIsDeletedAndBind(accountNameList, false, true));
} }
break; break;
case 2: case 2:
...@@ -969,6 +971,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -969,6 +971,7 @@ public class IpResourceServiceImpl implements IpResourceService {
notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 2, false, false); notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 2, false, false);
} else { } else {
notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, false); notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, false);
ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 2, false, true));
} }
break; break;
case 3: case 3:
...@@ -977,6 +980,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -977,6 +980,7 @@ public class IpResourceServiceImpl implements IpResourceService {
notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 1, false, false); notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndBind(username, 1, false, false);
} else { } else {
notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, false); notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, false);
ipResources.addAll(ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndBind(accountNameList, 1, false, true));
} }
break; break;
case 4: case 4:
...@@ -992,10 +996,12 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -992,10 +996,12 @@ public class IpResourceServiceImpl implements IpResourceService {
.stream() .stream()
.filter(x -> x.getValidTime() > Instant.now().toEpochMilli()) .filter(x -> x.getValidTime() > Instant.now().toEpochMilli())
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!isParent) if (!isParent) {
notUsed = ipResourceRepository.findByOwnerAndStatusInAndIsDeletedAndBind(username, Arrays.asList(0, 2, 4, 8), false, false); 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); 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; break;
} }
if (CollectionUtils.isNotEmpty(ipResources)) if (CollectionUtils.isNotEmpty(ipResources))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment