From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/resources/mapper/AlarmDailyMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/AlarmDailyMapper.xml b/src/main/resources/mapper/AlarmDailyMapper.xml
index b29f1c5..10b3bbd 100644
--- a/src/main/resources/mapper/AlarmDailyMapper.xml
+++ b/src/main/resources/mapper/AlarmDailyMapper.xml
@@ -64,6 +64,9 @@
 					<if test="level != null">
 					AND h.state = #{level}
 					</if>
+					<if test="professionId != null">
+					AND d.profession_id = #{professionId}
+					</if>
 				GROUP BY
 					<if test="dimension=='monitorPoint'">
 						mp.id,

--
Gitblit v1.8.0