提案管理-综合查询: 没有‘届次’条件时默认查询全部;
This commit is contained in:
+1
-1
@@ -76,7 +76,7 @@ public class ProposalQueryComprehensiveParam extends PageForm {
|
|||||||
//教代会届次
|
//教代会届次
|
||||||
if (Lang.isNotEmpty(searchParam.getSessionIds())) {
|
if (Lang.isNotEmpty(searchParam.getSessionIds())) {
|
||||||
cnd.and("info.sessionId", "in", searchParam.getSessionIds());
|
cnd.and("info.sessionId", "in", searchParam.getSessionIds());
|
||||||
} else {
|
} else if (StrUtil.isNotBlank(searchParam.getSessionId())) {
|
||||||
cnd.andEX("info.sessionId", "=", searchParam.getSessionId());
|
cnd.andEX("info.sessionId", "=", searchParam.getSessionId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-2
@@ -342,11 +342,12 @@ layout("/layouts/platform.html"){
|
|||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.sessionOptions = res.data
|
this.sessionOptions = res.data
|
||||||
if (this.sessionOptions) {
|
/*if (this.sessionOptions) {
|
||||||
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
|
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
|
||||||
this.listDelegation()
|
this.listDelegation()
|
||||||
this.pageData()
|
this.pageData()
|
||||||
}
|
}*/
|
||||||
|
this.pageData()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user