| .. | .. |
|---|
| 90 | 90 | LOG.info("Getting all packs for user: " + bsc.getUserPrincipal()); |
|---|
| 91 | 91 | q = em.createNamedQuery("list-packs", Pack.class); |
|---|
| 92 | 92 | } else { |
|---|
| 93 | | - if (bsc.getOrganizationsIds() == null) { |
|---|
| 93 | + if (bsc.getOrganizationsIds() == null || bsc.getOrganizationsIds().isEmpty() || // |
|---|
| 94 | + bsc.getApplicationsIds() == null || bsc.getApplicationsIds().isEmpty()) { |
|---|
| 94 | 95 | return Response.ok().build(); |
|---|
| 95 | 96 | } |
|---|
| 96 | | - q = em.createNamedQuery("list-packs-by-orgs", Pack.class); |
|---|
| 97 | | - q.setParameter("list_ids", bsc.getOrganizationsIds()); |
|---|
| 97 | + q = em.createNamedQuery("list-packs-by-orgs-apps", Pack.class); |
|---|
| 98 | + q.setParameter("list_ids_org", bsc.getOrganizationsIds()); |
|---|
| 99 | + q.setParameter("list_ids_app", bsc.getApplicationsIds()); |
|---|
| 100 | + LOG.info("Getting packs from orgs: {} and apps: {}", bsc.getOrganizationsIds(), bsc.getApplicationsIds()); |
|---|
| 98 | 101 | } |
|---|
| 99 | 102 | |
|---|
| 100 | 103 | List<Pack> list = q.getResultList(); |
|---|
