From 27696c4fc6a82ac3ed993aa0ae6ba01ae6fcbc3d Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Sat, 16 May 2026 15:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=A1=88=E7=AE=A1=E7=90=86-=E7=BB=BC?= =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2=EF=BC=9A=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E2=80=98=E5=B1=8A=E6=AC=A1=E2=80=99=E6=9D=A1=E4=BB=B6=E6=97=B6?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proposal/param/ProposalQueryComprehensiveParam.java | 2 +- .../zhgh/democratic/proposal/query/comprehensive/index.html | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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() } }) },