浏览代码

mxg:修改设备关联资产时,信息点合并,信息集合为null,报错的bug

mengxiangge 6 年之前
父节点
当前提交
d118d96ad2

+ 1 - 0
MBI/SAGA.MBI/RequestData/MatchFMRequest.cs

@@ -45,6 +45,7 @@ namespace SAGA.MBI.RequestData
             JObject fmJObject=new JObject();
             fmJObject.Add("BimId", equipment.BimID);
             fmJObject.Add("BuildId", DalProjectTree.GetBuildingIdByFloor(equipment.FloorId));
+            fmJObject.Add("CodeType", 1);
             fmJObject.Add("EquipmentId", equipment.Id);
             fmJObject.Add("Family", equipment.Family.Code);
             fmJObject.Add("FamilyName", equipment.Family.Name);

+ 1 - 0
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMatchFMTip_FMNoBimId.xaml.cs

@@ -119,6 +119,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
         private int GetNullItemsCount()
         {
             var source = InfoGrid.ItemsSource;
+            if (source == null) return 0;
             var items = new List<ItemProperty>();
             foreach (ItemProperty item in source)
             {