| 
					
				 | 
			
			
				@@ -135,7 +135,7 @@ public class AlarmTypeServiceImpl implements AlarmTypeService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             alarmType.setAlarmRuleNum(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (AlarmCategoryEnum.DATA_ALARM.getType() == dto.getAlarmCategory()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (AlarmCategoryEnum.DATA_ALARM.getType() == alarm.getAlarmCategory()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AlarmDataDTO dataDTO = BeanCopyUtils.copy(dto, AlarmDataDTO.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             dataDTO.setCustomerId(loginUser.getCustomerId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             dataDTO.setDeviceId(dto.getIotDeviceId()); 
			 |