@provis/provis-common-be-module 2.2.6 → 2.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -242,7 +242,7 @@ class MainRepository extends typeorm_1.Repository {
|
|
|
242
242
|
const statusValues = value.map((value) => `'${value.trim()}'`).join(',');
|
|
243
243
|
condition = data.query.replace(`:...${data.key}`, statusValues);
|
|
244
244
|
}
|
|
245
|
-
|
|
245
|
+
return condition.replace(columnName, `${aliasTable}."${columnName}"`);
|
|
246
246
|
}
|
|
247
247
|
generateRawFilter(search, additionalSearchOr, aliasTable = this.aliasTable()) {
|
|
248
248
|
let rawQueryFilter = 'WHERE 1=1';
|
|
@@ -278,7 +278,7 @@ class MainRepository extends typeorm_1.Repository {
|
|
|
278
278
|
manager.query(rawCount),
|
|
279
279
|
manager.query(`${rawQueryWithFilter} ${rawOrder} LIMIT $1 OFFSET $2`, [limit, offset]),
|
|
280
280
|
]);
|
|
281
|
-
return [countResult.
|
|
281
|
+
return [(countResult[0].total || 0), dataResult];
|
|
282
282
|
});
|
|
283
283
|
}
|
|
284
284
|
}
|
|
@@ -34,13 +34,13 @@ exports.default = ({ searchValue, searchKey, operatorValue, keyName = searchKey,
|
|
|
34
34
|
};
|
|
35
35
|
case operator_1.default.OPERATOR_DATE_MIN:
|
|
36
36
|
return {
|
|
37
|
-
query: `${keyName}::date >= :${searchKey}`,
|
|
37
|
+
query: `${keyName} ::date >= :${searchKey}`,
|
|
38
38
|
key: searchKey,
|
|
39
39
|
value,
|
|
40
40
|
};
|
|
41
41
|
case operator_1.default.OPERATOR_DATE_MAX:
|
|
42
42
|
return {
|
|
43
|
-
query: `${keyName}::date <= :${searchKey}`,
|
|
43
|
+
query: `${keyName} ::date <= :${searchKey}`,
|
|
44
44
|
key: searchKey,
|
|
45
45
|
value,
|
|
46
46
|
};
|