update master

This commit is contained in:
2024-12-02 14:02:17 +07:00
parent 6fd4d1f9c1
commit f988b3add4

View File

@ -163,12 +163,17 @@ export default class CommonHelper {
}
}
let whereAttr = '';
if (whereAttrPre.length > 0) {
whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + (param.additional_where ?? '');
} else {
whereAttr += param.additional_where;
}
const whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + (param.additional_where ?? '');
// let whereAttr = '';
// 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 };