diff --git a/Learun.Application.Web/AppApi/PlotLayoutApiController.cs b/Learun.Application.Web/AppApi/PlotLayoutApiController.cs index de74eb8e..29b154e7 100644 --- a/Learun.Application.Web/AppApi/PlotLayoutApiController.cs +++ b/Learun.Application.Web/AppApi/PlotLayoutApiController.cs @@ -244,10 +244,9 @@ namespace Learun.Application.Web.AppApi area = "ERR", }; basePoint.Tags.Add(layoutTagInfoInvalid); - foreach (var item in EquipPropAll) + foreach (var item in EquipPropAll.Where(x=>x.EngineDataID== matchPointTagId)) { - if (matchPointTagIdSet.Contains(item.EngineDataID)) - item.Marker = true; + item.Marker = true; } continue; } @@ -266,6 +265,11 @@ namespace Learun.Application.Web.AppApi { strRoom = matchedRoom.DataItemName; } + if(matchedRoom==null && basePoint.RoomNo!=string.Empty)//这里基点也要判断下,只有是基点带ROOMNO值的才不统计 + { + //如果房间号没有匹配的,肋位号有,则不打标记,而且应该把该位号放到只有肋位号的基点上去,没有这种基点则不统计 + continue; + } var Prop_FrameOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_FrameOff)?.PropertyValue; var Prop_YOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue; @@ -365,10 +369,9 @@ namespace Learun.Application.Web.AppApi RoomNo = strRoom }; basePoint.Tags.Add(layoutTagInfo); - foreach (var item in EquipPropAll) + foreach (var item in EquipPropAll.Where(x => x.EngineDataID == matchPointTagId)) { - if (matchPointTagIdSet.Contains(item.EngineDataID)) - item.Marker = true; + item.Marker = true; } } #endregion