TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update master

Browse Source
This commit is contained in:
Abdul Rahman Reza
2024-12-02 14:02:17 +07:00
parent 6fd4d1f9c1
commit f988b3add4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/helpers/common.ts
View File

@ -163,12 +163,17 @@ export default class CommonHelper {
} }
} }
let whereAttr = '';
if (whereAttrPre.length > 0) { const whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + (param.additional_where ?? '');
whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + (param.additional_where ?? '');
} else { // let whereAttr = '';
whereAttr += param.additional_where; // if (whereAttrPre.length > 0) {
} // whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + param.additional_where;
// } else {
// whereAttr += param.additional_where;
// }
// console.log('whereAttr', whereAttr)
return { whereAttr, whereVal }; return { whereAttr, whereVal };