From 2e53fdad625825a7cfb24b849494ebb5026a4d67 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 10 十一月 2022 09:30:47 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/PoleBindingMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/PoleBindingMapper.xml b/dao/src/main/resources/mapper/PoleBindingMapper.xml
index cd53447..92f0a44 100644
--- a/dao/src/main/resources/mapper/PoleBindingMapper.xml
+++ b/dao/src/main/resources/mapper/PoleBindingMapper.xml
@@ -23,8 +23,20 @@
<select id="getPoleByBinding" resultType="com.sandu.ximon.dao.domain.Pole">
SELECT t2.*
FROM `pole_binding` t1
- LEFT JOIN pole t2 ON t1.pole_id = t2.id
- WHERE t1.device_type = #{type}
- AND t1.device_code = #{Mac}
+ LEFT JOIN pole t2 ON t1.pole_id = t2.id
+ <where>
+ t1.device_code = #{Mac}
+ AND t1.device_type=0
+ <if test="type != null">
+ AND t1.device_type = #{type}
+ </if>
+ <if test="userId != null">
+ AND (
+ t2.user_id = #{userId}
+ OR t2.client_id = #{userId}
+ )
+ </if>
+ </where>
+
</select>
</mapper>
--
Gitblit v1.9.3