From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index a3ac636..b9d9f2b 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -175,17 +175,17 @@
mpt.organization_id = #{orgId}
</if>
and dev.is_delete = 0
- and (
- <![CDATA[
- 1 <> 1
- ]]>
+ <if test="devState!=null">
+ and dev.state = #{devState}
+ </if>
<if test="name!=null and ''!=name">
- or dev.name like CONCAT('%',#{name},'%')
+ and
+ (
+ dev.name like CONCAT('%',#{name},'%')
or dev.mac like CONCAT('%',#{name},'%')
or mpt.name like CONCAT('%',#{name},'%')
+ )
</if>
- )
-
</where>
</select>
<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
--
Gitblit v1.8.0