From 7e0534d52520407b1005e9a5f20945d927e92408 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 11:09:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 1b61bbb..d44f659 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -38,7 +38,15 @@
WHERE mac = #{mac}
AND `time` <![CDATA[>=]]> #{time1}
AND `time` <![CDATA[<=]]> #{time2}
- AND organization_id = #{orgId}
+ <if test="orgId !=null and orgId != 0">
+ AND organization_id = #{orgId}
+ </if>
+ <if test="orgIds != null and orgIds.size !=0">
+ and organization_id in
+ <foreach collection="orgIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
order by time
</select>
--
Gitblit v1.8.0