From d65594e37be2179b60cdc1730819ff156b39639c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/MonitorMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index 6a7365d..3bbbc46 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -62,15 +62,15 @@
OR t1.note LIKE CONCAT(CONCAT('%', #{keyword}), '%')
OR t3.pole_code LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
- </if>
<if test="bindingState != 2">
AND t1.binding_state = #{bindingState}
</if>
<if test="equipmentState != 2">
AND t1.equipment_state = #{equipmentState}
</if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
</where>
</select>
<select id="listMonitorDeviceSerial" resultType="java.lang.String">
--
Gitblit v1.9.3