[後端] 修改前台api 閃光喇叭處理
This commit is contained in:
		
							parent
							
								
									b0295ba003
								
							
						
					
					
						commit
						0c662ec5d1
					
				@ -477,6 +477,7 @@ namespace FrontendWebApi.ApiControllers
 | 
			
		||||
                var devicesql = "";
 | 
			
		||||
                var layer3sql = "";
 | 
			
		||||
                var sWhere = "";
 | 
			
		||||
                var singleSubSql = "";
 | 
			
		||||
                if (!String.IsNullOrEmpty(post.main_system_tag))
 | 
			
		||||
                {
 | 
			
		||||
                    main_system_guidsql = $" and d.device_system_tag = '{post.main_system_tag}'";
 | 
			
		||||
@ -484,9 +485,15 @@ namespace FrontendWebApi.ApiControllers
 | 
			
		||||
                if (!String.IsNullOrEmpty(post.sub_system_tag))
 | 
			
		||||
                {
 | 
			
		||||
                    if (!string.IsNullOrEmpty(projectName) && projectName.Contains("ibms_dome") && (post.main_system_tag == "S" && post.sub_system_tag == "P"))
 | 
			
		||||
                    {
 | 
			
		||||
                        sub_system_guidsql = $@" and (d.device_name_tag = '{post.sub_system_tag}' or d.device_name_tag = 'B')";
 | 
			
		||||
                        singleSubSql = $"and (di.device_name_tag = '{post.sub_system_tag}' or di.device_name_tag = 'B')";
 | 
			
		||||
                    }
 | 
			
		||||
                    else
 | 
			
		||||
                    {
 | 
			
		||||
                        sub_system_guidsql = $" and d.device_name_tag = '{post.sub_system_tag}'";
 | 
			
		||||
                        singleSubSql = $"and di.device_name_tag = '{post.sub_system_tag}'";
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                if (!String.IsNullOrEmpty(post.device_system_category_layer3))
 | 
			
		||||
                {
 | 
			
		||||
@ -592,7 +599,7 @@ namespace FrontendWebApi.ApiControllers
 | 
			
		||||
			                                AND di.deleted = 0 
 | 
			
		||||
			                                AND di.is_link = 1
 | 
			
		||||
			                                AND di.is_show_riserDiagram = 1
 | 
			
		||||
                                            and di.device_name_tag = '{post.sub_system_tag}'
 | 
			
		||||
                                            {(string.IsNullOrEmpty(singleSubSql) ? $"and di.device_name_tag = '{post.sub_system_tag}'" : singleSubSql)}
 | 
			
		||||
                                            limit 1000
 | 
			
		||||
		                            ) di on di.device_name_tag = d.device_name_tag
 | 
			
		||||
                                    left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user