distinct when filtering on man

flipboxfactory · Jan 25, 2019 · 1cf631e · 1cf631e
1 parent 15b3fd7
commit 1cf631e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/queries/OrganizationQuery.php b/src/queries/OrganizationQuery.php
@@ -234,7 +234,10 @@ protected function applyTypeParam()
         }
 
         $alias = $this->joinOrganizationTypeTable();
-        $this->subQuery->andWhere(
+
+        $this->subQuery
+            ->distinct(true)
+            ->andWhere(
             Db::parseParam($alias . '.typeId', $this->parseOrganizationTypeValue($this->organizationType))
         );
     }

diff --git a/src/queries/UserQueryParamHandler.php b/src/queries/UserQueryParamHandler.php
@@ -158,14 +158,14 @@ protected function applyUserTypeParam(UserQuery $query, $type)
             return;
         }
 
-        $query->subQuery->distinct(true);
-
         $this->joinOrganizationUserTypeTable($query->subQuery);
-        $query->subQuery->andWhere(
-            Db::parseParam(
-                UserCollectionUsersRecord::tableAlias() . '.typeId',
-                $this->parseUserTypeValue($type)
-            )
-        );
+        $query->subQuery
+            ->distinct(true)
+            ->andWhere(
+                Db::parseParam(
+                    UserCollectionUsersRecord::tableAlias() . '.typeId',
+                    $this->parseUserTypeValue($type)
+                )
+            );
     }
 }