From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
index 06ddea5..0f52fe2 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
@@ -51,6 +51,7 @@
<include refid="selectArdEquipExternalVo"/>
<where>
<if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
<if test="type != null and type != ''">and c.type = #{type}</if>
<if test="factory != null and factory != ''">and c.factory = #{factory}</if>
<if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
--
Gitblit v1.9.3