fix error
This commit is contained in:
		
							parent
							
								
									168574c941
								
							
						
					
					
						commit
						aac9ef3f9e
					
				@ -186,8 +186,8 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                                   from device d
 | 
					                                   from device d
 | 
				
			||||||
                                   left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag
 | 
					                                   left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag
 | 
				
			||||||
					                                   and d.device_name_tag = dk.device_name_tag
 | 
										                                   and d.device_name_tag = dk.device_name_tag
 | 
				
			||||||
                                   where d.deleted = 0 and d.device_system_tag = @sub_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = ifnull(@floor_tag, d.device_floor_tag)";
 | 
					                                   where d.deleted = 0 and d.device_name_tag = @sub_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = ifnull(@floor_tag, d.device_floor_tag)";
 | 
				
			||||||
                    var dlParam = new { @main_system_tag = fd.main_system_tag, @building_tag = fd.building_tag, @floor_tag = fd.floor_tag };
 | 
					                    var dlParam = new { @sub_system_tag = fd.sub_system_tag, @building_tag = fd.building_tag, @floor_tag = fd.floor_tag };
 | 
				
			||||||
                    dl = await backendRepository.GetAllAsync<DeviceLists>(sqlString, dlParam);
 | 
					                    dl = await backendRepository.GetAllAsync<DeviceLists>(sqlString, dlParam);
 | 
				
			||||||
                    f.device_list = dl;
 | 
					                    f.device_list = dl;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
				
			|||||||
@ -7,6 +7,7 @@ namespace FrontendWebApi.Models
 | 
				
			|||||||
    public class FindDevice
 | 
					    public class FindDevice
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        public string main_system_tag { get; set; }
 | 
					        public string main_system_tag { get; set; }
 | 
				
			||||||
 | 
					        public string sub_system_tag { get; set; }
 | 
				
			||||||
        public string building_tag { get; set; }
 | 
					        public string building_tag { get; set; }
 | 
				
			||||||
        public string floor_tag { get; set; }
 | 
					        public string floor_tag { get; set; }
 | 
				
			||||||
        public string device_guid { get; set; }
 | 
					        public string device_guid { get; set; }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user