浏览代码

Merge branch 'ftth#80' into 'master'

Show all onus from tenancy base on export

See merge request interlink-sa/flowdat3/modules/ftth!186
Jean Sumara Leopoldo 5 年之前
父节点
当前提交
252904504c
共有 1 个文件被更改,包括 8 次插入4 次删除
  1. 8 4
      src/FTTHBundle/Repository/ONURepository.php

+ 8 - 4
src/FTTHBundle/Repository/ONURepository.php

@@ -56,10 +56,14 @@ class ONURepository extends \Doctrine\ORM\EntityRepository
                 'o.clientId'
             ])
             ->join('o.olt', "olt")
-            ->leftJoin('o.nap', "nap")
-            ->where('o.tenancyId = :tenancyId')
-            ->setParameter('tenancyId', $tenancyId)
-            ->orderBy('o.created', 'DESC')
+            ->leftJoin('o.nap', "nap");
+
+        if($tenancyId != 1){
+            $query->where('o.tenancyId = :tenancyId')
+                ->setParameter('tenancyId', $tenancyId);
+        }
+
+        $query->orderBy('o.created', 'DESC')
             ->setMaxResults($limit)
             ->setFirstResult($offset);