From 4c689b09a8eb93fc35f211cb60c26cee57989597 Mon Sep 17 00:00:00 2001 From: JunZai <819209789@qq.com> Date: Fri, 10 Jul 2020 11:12:12 +0800 Subject: [PATCH] update --- .../CONTROL-BASE.vue.ftl" | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git "a/@CONTROL/\346\220\234\347\264\242\346\240\217/CONTROL-BASE.vue.ftl" "b/@CONTROL/\346\220\234\347\264\242\346\240\217/CONTROL-BASE.vue.ftl" index 1bd5745b..3c0c35d5 100644 --- "a/@CONTROL/\346\220\234\347\264\242\346\240\217/CONTROL-BASE.vue.ftl" +++ "b/@CONTROL/\346\220\234\347\264\242\346\240\217/CONTROL-BASE.vue.ftl" @@ -170,7 +170,8 @@ FilterTree, Object.assign(data, { query: this.query }) } --> if(this.filterFields.length > 0) { - Object.assign(data, { filter: this.getFilter() }) + let filter: any = this.getFilter(); + Object.assign(data, { filter: filter ? JSON.stringify(filter) : null }) } return data; } @@ -187,6 +188,9 @@ FilterTree, } let ands: any[] = this.transformAnd(this.filterItems); this.transformResult(ands, '$and'); + if(ands.length === 0) { + return null; + } return { '$and': ands }; } -- 2.21.0