|
@@ -55,7 +55,7 @@
|
|
c.alarm_level,
|
|
c.alarm_level,
|
|
c.trigger_backend,c.trigger_frontend,c.info_codes,c.trigger_uphold
|
|
c.trigger_backend,c.trigger_frontend,c.info_codes,c.trigger_uphold
|
|
from project_alarm_rule a
|
|
from project_alarm_rule a
|
|
- left join alarm_condition c on a.alarm_condition_id = c.id
|
|
+ left join alarm_condition_v2 c on a.alarm_condition_id = c.id
|
|
where a.group_id = #{groupId} and a.valid = 1 and a.project_id = #{projectId}
|
|
where a.group_id = #{groupId} and a.valid = 1 and a.project_id = #{projectId}
|
|
<if test="alarmItemCode != null and alarmItemCode != ''">
|
|
<if test="alarmItemCode != null and alarmItemCode != ''">
|
|
and a.alarm_item_code = #{alarmItemCode}
|
|
and a.alarm_item_code = #{alarmItemCode}
|