|  | @ -235,7 +235,7 @@ async function problem (ctx) { | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |       if (anxinStruc.length) { |  |  |       if (anxinStruc.length) { | 
			
		
	
		
		
			
				
					|  |  |          const anxinStrucIds = anxinStruc.map(a => a.strucId) |  |  |          const anxinStrucIds = anxinStruc.map(a => a.strucId) | 
			
		
	
		
		
			
				
					
					|  |  |          whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")})`) |  |  |          whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")}, -1)`) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  |          const alarmRes = await clickHouse.dataAlarm.query(` |  |  |          const alarmRes = await clickHouse.dataAlarm.query(` | 
			
		
	
		
		
			
				
					|  |  |             SELECT  |  |  |             SELECT  | 
			
		
	
		
		
			
				
					|  |  |                AlarmId,State,AlarmGroup,AlarmGroupUnit,SourceName,StartTime,${anxinyun}.t_alarm_group_unit.name AS typeName |  |  |                AlarmId,State,AlarmGroup,AlarmGroupUnit,SourceName,StartTime,${anxinyun}.t_alarm_group_unit.name AS typeName | 
			
		
	
	
		
		
			
				
					|  | @ -304,7 +304,7 @@ async function problem (ctx) { | 
			
		
	
		
		
			
				
					|  |  |                            RIGHT JOIN ${anxinyun}.t_video_ipc |  |  |                            RIGHT JOIN ${anxinyun}.t_video_ipc | 
			
		
	
		
		
			
				
					|  |  |                               ON toString(${anxinyun}.t_video_ipc.channel_no) = camera_status_alarm.channel_no |  |  |                               ON toString(${anxinyun}.t_video_ipc.channel_no) = camera_status_alarm.channel_no | 
			
		
	
		
		
			
				
					|  |  |                               AND ${anxinyun}.t_video_ipc.serial_no = camera_status_alarm.serial_no |  |  |                               AND ${anxinyun}.t_video_ipc.serial_no = camera_status_alarm.serial_no | 
			
		
	
		
		
			
				
					
					|  |  |                               ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')})`} |  |  |                               ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')}, -1)`} | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  |                         ) |  |  |                         ) | 
			
		
	
		
		
			
				
					|  |  |                         ${limit ? 'LIMIT ' + limit : ''} |  |  |                         ${limit ? 'LIMIT ' + limit : ''} | 
			
		
	
		
		
			
				
					|  |  |                         ${limit && page ? 'OFFSET ' + parseInt(limit) * parseInt(page) : ''} |  |  |                         ${limit && page ? 'OFFSET ' + parseInt(limit) * parseInt(page) : ''} | 
			
		
	
	
		
		
			
				
					|  | 
 |