diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java index da9ff17..687e071 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java @@ -76,7 +76,7 @@ public class ProposalQueryComprehensiveParam extends PageForm { //教代会届次 if (Lang.isNotEmpty(searchParam.getSessionIds())) { cnd.and("info.sessionId", "in", searchParam.getSessionIds()); - } else { + } else if (StrUtil.isNotBlank(searchParam.getSessionId())) { cnd.andEX("info.sessionId", "=", searchParam.getSessionId()); } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html index 6d41f36..2dfac84 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html @@ -342,11 +342,12 @@ layout("/layouts/platform.html"){ }).then((res) => { if (res.code === 0) { this.sessionOptions = res.data - if (this.sessionOptions) { + /*if (this.sessionOptions) { this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) this.listDelegation() this.pageData() - } + }*/ + this.pageData() } }) },