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/AlarmConfigMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmConfigMapper.xml b/src/main/resources/mapper/AlarmConfigMapper.xml
index 9d0bbd4..32e25ad 100644
--- a/src/main/resources/mapper/AlarmConfigMapper.xml
+++ b/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -12,7 +12,7 @@
id, organization_id, value, create_time, update_time
</sql>
<select id="selectByOrganizationId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
+ select
<include refid="Base_Column_List" />
from alarm_config
where organization_id = #{organizationId,jdbcType=INTEGER}
@@ -97,4 +97,11 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
+ <select id="selectByMonitorPointId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ select
+ acg.*
+ from alarm_config acg
+ LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id
+ where mpt.id = #{mpId,jdbcType=INTEGER}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0