Skip to content

B
browser-backend
Commit 5ad502f6 authored by renjie's avatar renjie
Browse files
Options

子用户ip主账户显示

parent 27331c72
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @ 5ad502f6
...@@ -570,27 +570,27 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -570,27 +570,27 @@ public class IpResourceServiceImpl implements IpResourceService {
switch (groupType) { switch (groupType) {
case 1: case 1:
ipResources = ipResourceRepository.findByShopIdInAndIsDeleted(shopIds, false); ipResources = ipResourceRepository.findByShopIdInAndIsDeleted(shopIds, false);
if (isParent) if (!isParent)
notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndShopIdIsNull(username, false); notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndShopIdIsNull(username, false);
else else
notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndShopIdIsNull(children, false); notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndShopIdIsNull(children, false);
break; break;
case 2: case 2:
ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(2, shopIds, false); ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(2, shopIds, false);
if (isParent) if (!isParent)
notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 2, false); notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 2, false);
else else
notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 2, false); notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 2, false);
break; break;
case 3: case 3:
ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(1, shopIds, false); ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(1, shopIds, false);
if (isParent) if (!isParent)
notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 1, false); notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 1, false);
else else
notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 1, false); notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 1, false);
break; break;
case 4: case 4:
if (isParent) if (!isParent)
notUsed = ipResourceRepository.findByOwnerAndStatusIsNotInAndIsDeletedAndShopIdIsNull(username, Arrays.asList(3, 5, 6),false); notUsed = ipResourceRepository.findByOwnerAndStatusIsNotInAndIsDeletedAndShopIdIsNull(username, Arrays.asList(3, 5, 6),false);
else else
notUsed = ipResourceRepository.findByOwnerInAndStatusIsNotInAndIsDeletedAndShopIdIsNull(children, Arrays.asList(3, 5, 6), false); notUsed = ipResourceRepository.findByOwnerInAndStatusIsNotInAndIsDeletedAndShopIdIsNull(children, Arrays.asList(3, 5, 6), false);
......
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