From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcMessageApprovalMapper.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 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 39169e2..4e53609 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 @@ -2,4 +2,21 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.mdc.mapper.MdcMessageApprovalMapper"> + <!--鍒楄〃鏌ヨ--> + <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcMessageApproval"> + SELECT + * + FROM + mdc_message_approval + <where> + (sender_ids LIKE CONCAT(CONCAT('%',#{userId}),'%') OR approver_ids LIKE CONCAT(CONCAT('%',#{userId}),'%')) + <if test="mdcMessageApproval.equipmentId != null and mdcMessageApproval.equipmentId != ''"> + AND equipment_id = #{mdcMessageApproval.equipmentId} + </if> + <if test="mdcMessageApproval.msgStatus != null and mdcMessageApproval.msgStatus != ''"> + AND msg_status = #{mdcMessageApproval.msgStatus} + </if> + </where> + ORDER BY create_time DESC + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3