From ecf1ec75a444ac96398a0cd68106dc2dea01ea33 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 15 一月 2025 20:34:40 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml index 0a17db6..e17af54 100644 --- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml +++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml @@ -299,6 +299,12 @@ <if test="data.completeTimeEnd != null and data.completeTimeEnd != ''"> and DATE(o.complete_time) <![CDATA[ <= ]]> #{data.completeTimeEnd} </if> + <if test="data.siteIds != null and data.siteIds.size() != 0"> + and o.site_id in + <foreach collection="data.siteIds" item="id" open="(" separator="," close=")"> + #{id} + </foreach> + </if> </where> order by o.createTime desc </select> -- Gitblit v1.7.1