From fbde1396aafe5ae24a48c01b26e93fe76604dc1e Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 09 Jun 2018 11:12:21 +0800
Subject: [PATCH] test
---
src/main/resources/mapper/DeviceMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 35c4788..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">
@@ -288,6 +288,9 @@
<if test="areaCode != null">
AND mp.area_code = #{areaCode}
</if>
+ <if test="monitorPointId != null">
+ AND mp.id = #{monitorPointId}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
--
Gitblit v1.8.0