Merge pull request nestjsx#511 from nestjsx/fix/typeorm-join-select

fix(typeorm): fixed join select fields
XiKun-TW · May 14, 2020 · 33a69e5 · 33a69e5
2 parents 651ee4e + b19f50e
commit 33a69e5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts
@@ -567,10 +567,16 @@ export class TypeOrmCrudService<T> extends CrudService<T> {
     builder[relationType](allowedRelation.path, alias);
 
     if (options.select !== false) {
+      const columns = isArrayFull(cond.select)
+        ? cond.select.filter((column) =>
+            allowedRelation.allowedColumns.some((allowed) => allowed === column),
+          )
+        : allowedRelation.allowedColumns;
+
       const select = [
         ...allowedRelation.primaryColumns,
-        ...(options.persist && options.persist.length ? options.persist : []),
-        ...allowedRelation.allowedColumns,
+        ...(isArrayFull(options.persist) ? options.persist : []),
+        ...columns,
       ].map((col) => `${alias}.${col}`);
 
       builder.addSelect(select);