diff --git a/src/helpers/common.ts b/src/helpers/common.ts index 2a4e6f2..d37f948 100644 --- a/src/helpers/common.ts +++ b/src/helpers/common.ts @@ -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 };