From df9586ac7f3abd90d7b2aec871c7e6ac3d829d94 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期四, 16 五月 2024 17:46:22 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
index 16ec34c..4313582 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
@@ -26,7 +26,9 @@
<select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
<include refid="selectDeviceLogVo"/>
- <where>
+ <where>
+ <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
+ <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
--
Gitblit v1.9.1