Merge branch 'dev-zrj' into 'staging'

子用户ip主账户显示

See merge request !132

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

@@ -570,27 +570,27 @@ public class IpResourceServiceImpl implements IpResourceService {
         switch (groupType) {
             case 1:
                 ipResources = ipResourceRepository.findByShopIdInAndIsDeleted(shopIds, false);
-                if (isParent)
+                if (!isParent)
                     notUsed = ipResourceRepository.findByOwnerAndIsDeletedAndShopIdIsNull(username, false);
                 else
                     notUsed = ipResourceRepository.findByOwnerInAndIsDeletedAndShopIdIsNull(children, false);
                 break;
             case 2:
                 ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(2, shopIds, false);
-                if (isParent)
+                if (!isParent)
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 2, false);
                 else
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 2, false);
                 break;
             case 3:
                 ipResources = ipResourceRepository.findByStatusAndShopIdInAndIsDeleted(1, shopIds, false);
-                if (isParent)
+                if (!isParent)
                     notUsed = ipResourceRepository.findByOwnerAndStatusAndIsDeletedAndShopIdIsNull(username, 1, false);
                 else
                     notUsed = ipResourceRepository.findByOwnerInAndStatusAndIsDeletedAndShopIdIsNull(children, 1, false);
                 break;
             case 4:
-                if (isParent)
+                if (!isParent)
                     notUsed = ipResourceRepository.findByOwnerAndStatusIsNotInAndIsDeletedAndShopIdIsNull(username, Arrays.asList(3, 5, 6),false);
                 else
                     notUsed = ipResourceRepository.findByOwnerInAndStatusIsNotInAndIsDeletedAndShopIdIsNull(children, Arrays.asList(3, 5, 6), false);