From d5d18e36e370b804f6e5f352e75fe3a2b3ae9610 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 13:58:56 +0800
Subject: [PATCH] 微信报警详情页bug修复
---
src/main/resources/mapper/AlarmMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index cad7fec..a1f8c94 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.AlarmMapper">
- <select id="getAlarmData" resultType="java.util.LinkedHashMap">
+ <select id="getAlarmData" resultType="java.util.Map">
SELECT
<if test="dimension=='monitorPoint'">
`name`,
@@ -61,6 +61,9 @@
<if test="mac != null">
AND d.mac = #{mac}
</if>
+ <if test="level != null">
+ AND h.state = #{level}
+ </if>
GROUP BY
<if test="dimension=='monitorPoint'">
mp.id,
--
Gitblit v1.8.0