|
@@ -20,7 +20,7 @@ public class AlarmDefineService {
|
|
|
public List<AlarmDefineVO> loadByHolder(String holderId) {
|
|
|
String sql="""
|
|
|
select alarm_id,alarm_desc,alarm_source,alarm_express,express_desc,alarm_mode,alarm_grade,
|
|
|
- alm.compose_if,alm.using_if,alm.modify_time,alm.modify_by,
|
|
|
+ alm.using_if,alm.modify_time,alm.modify_by,
|
|
|
ifnull(wp.param_name,w.well_name) alarm_source_name
|
|
|
from tzl_alarm alm
|
|
|
left join tzl_well_param wp on alm.alarm_source=wp.param_id
|