|
|
@@ -54,7 +54,7 @@ export abstract class GenericCrudService<T extends ObjectLiteral> {
|
|
|
|
|
|
// 关键词搜索
|
|
|
if (keyword && searchFields && searchFields.length > 0) {
|
|
|
- query.andWhere(searchFields.map(field => `entity.${field} LIKE :keyword`).join(' OR '), {
|
|
|
+ query.andWhere(`(${searchFields.map(field => `entity.${field} LIKE :keyword`).join(' OR ')})`, {
|
|
|
keyword: `%${keyword}%`
|
|
|
});
|
|
|
}
|
|
|
@@ -116,7 +116,11 @@ export abstract class GenericCrudService<T extends ObjectLiteral> {
|
|
|
query.orderBy(`entity.${key}`, direction);
|
|
|
});
|
|
|
|
|
|
- return query.skip(skip).take(pageSize).getManyAndCount();
|
|
|
+ const finalQuery = query.skip(skip).take(pageSize);
|
|
|
+
|
|
|
+ // console.log(finalQuery.getSql())
|
|
|
+
|
|
|
+ return finalQuery.getManyAndCount();
|
|
|
}
|
|
|
|
|
|
/**
|