diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 06fe095..495d263 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -85,7 +85,8 @@
- and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+ and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+ or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
@@ -172,7 +173,8 @@
LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
WHERE STATUS = 1
- and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+ and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+ or ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))