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/WaterQualityEquipmentMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
index 6fe2d84..1e93afc 100644
--- a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
@@ -41,7 +41,7 @@
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
<if test="clientId != null">
- AND t3.client_id = #{clientId}
+ AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
</if>
</where>
</select>
--
Gitblit v1.9.3