diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java index fdf2144..d592174 100644 --- a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java +++ b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java @@ -37,7 +37,7 @@ public class preAuditQueryController { @At @ViReturn @RequiresPermissions("reimbursementPreAudit.manage") - public Object pageData(PageForm pageForm, String startDate, String endDate, String notes) { + public Object pageData(PageForm pageForm, String startDate, String endDate, String notes,String unitId,String unionId) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" SELECT * FROM `reimbursement_pre_audit` $condition @@ -46,6 +46,8 @@ public class preAuditQueryController { cnd.andEX("applyDate", "<=", endDate); cnd.andEX("userId", "=", ShiroUtil.getUserId()); cnd.andEX("auditState", "=", 3); + cnd.andEX("unitId", "=", unitId); + cnd.andEX("unionId", "=", unionId); cnd.desc("applyDate").desc("opAt"); if (StrUtil.isNotEmpty(notes)) { cnd.andEX("notes", "like", "%" + notes + "%"); diff --git a/src/main/resources/views/platform/member/info/GroupInfo.html b/src/main/resources/views/platform/member/info/GroupInfo.html index 2775e47..8665108 100644 --- a/src/main/resources/views/platform/member/info/GroupInfo.html +++ b/src/main/resources/views/platform/member/info/GroupInfo.html @@ -191,7 +191,7 @@ layout("/layouts/platform.html"){ 入会时间: