From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 10 七月 2025 10:43:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml index e2b4aa5..f816c08 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml @@ -14,7 +14,13 @@ AND equipment_id = #{mdcMessageApproval.equipmentId} </if> <if test="mdcMessageApproval.msgStatus != null and mdcMessageApproval.msgStatus != ''"> - AND msg_status = #{msgStatus} + AND msg_status = #{mdcMessageApproval.msgStatus} + </if> + <if test="mdcMessageApproval.msgType != null and mdcMessageApproval.msgType != ''"> + AND msg_type = #{mdcMessageApproval.msgType} + </if> + <if test="mdcMessageApproval.msgSource != null and mdcMessageApproval.msgSource != ''"> + AND msg_source = #{mdcMessageApproval.msgSource} </if> </where> ORDER BY create_time DESC -- Gitblit v1.9.3