修改錯誤api
This commit is contained in:
		
							parent
							
								
									3e9117db5d
								
							
						
					
					
						commit
						5acecf13cb
					
				@ -527,7 +527,8 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                                    bm.left_icon_click_url_height,
 | 
					                                    bm.left_icon_click_url_height,
 | 
				
			||||||
                                    di.full_name as point_name,
 | 
					                                    di.full_name as point_name,
 | 
				
			||||||
                                    di.points,
 | 
					                                    di.points,
 | 
				
			||||||
                                    di.is_bool as points_is_bool
 | 
					                                    di.is_bool as points_is_bool,
 | 
				
			||||||
 | 
					                                    f.floor_guid
 | 
				
			||||||
                                    from device d 
 | 
					                                    from device d 
 | 
				
			||||||
                                    left join device_kind dk on d.device_building_tag = dk.device_building_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_system_tag = dk.device_system_tag
 | 
				
			||||||
@ -538,6 +539,7 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                                    left join device_item di ON d.device_name_tag = di.device_name_tag 
 | 
					                                    left join device_item di ON d.device_name_tag = di.device_name_tag 
 | 
				
			||||||
                                                              AND di.deleted = 0 
 | 
					                                                              AND di.deleted = 0 
 | 
				
			||||||
                                                              AND di.is_show_riserDiagram = 1
 | 
					                                                              AND di.is_show_riserDiagram = 1
 | 
				
			||||||
 | 
					                                    left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0
 | 
				
			||||||
                                    {disasterjoinsql}
 | 
					                                    {disasterjoinsql}
 | 
				
			||||||
                                    LEFT JOIN building_menu bm ON d.device_building_tag = bm.building_tag AND d.device_system_tag = bm.main_system_tag AND d.device_name_tag = bm.sub_system_tag
 | 
					                                    LEFT JOIN building_menu bm ON d.device_building_tag = bm.building_tag AND d.device_system_tag = bm.main_system_tag AND d.device_name_tag = bm.sub_system_tag
 | 
				
			||||||
                                    where d.deleted = 0 and d.device_building_tag = '{post.building_tag}' {sWhere}
 | 
					                                    where d.deleted = 0 and d.device_building_tag = '{post.building_tag}' {sWhere}
 | 
				
			||||||
 | 
				
			|||||||
@ -136,7 +136,6 @@ namespace FrontendWebApi.Models
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    public class DeviceFloor : Device
 | 
					    public class DeviceFloor : Device
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        public string floor_guid { get; set; }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user