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

update comm

Browse Source
This commit is contained in:
Abdul Rahman Reza
2024-12-02 13:56:11 +07:00
parent e0010d2324
commit 6a7a969518
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/helpers/common.ts
View File

@ -116,7 +116,9 @@ export default class CommonHelper {
wtp.push(like); wtp.push(like);
} }
whereAttrPre.push('(' + wtp.join(' or ') + ')'); if (wtp.length > 0) {
whereAttrPre.push('(' + wtp.join(' or ') + ')');
}
if (param.col_any_eq.length > 0) { if (param.col_any_eq.length > 0) {
whereVal['filter_eq'] = filter_any_val; whereVal['filter_eq'] = filter_any_val;
@ -147,7 +149,10 @@ export default class CommonHelper {
wtp.push(like); wtp.push(like);
} }
whereAttrPre.push('(' + wtp.join(' or ') + ')'); if (wtp.length > 0) {
whereAttrPre.push('(' + wtp.join(' or ') + ')');
}
if (param.col_any_eq.length > 0) { if (param.col_any_eq.length > 0) {
whereVal['filter_eq'] = param.filter.toLowerCase(); whereVal['filter_eq'] = param.filter.toLowerCase();
@ -158,8 +163,12 @@ export default class CommonHelper {
} }
} }
let whereAttr = '';
const whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + 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;
}
return { whereAttr, whereVal }; return { whereAttr, whereVal };