微信报警详情页bug修复

fengxiang

2018-04-25 d5d18e36e370b804f6e5f352e75fe3a2b3ae9610

 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,8 +61,8 @@
               <if test="mac != null">

               AND d.mac =   #{mac}

               </if>

               <if test="state != null">

               AND h.state = #{state}

               <if test="level != null">

               AND h.state = #{level}

               </if>

            GROUP BY

               <if test="dimension=='monitorPoint'">