Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -987,12 +987,17 @@ namespace Business.ResourceExamineManagement
             {
                 //throw new bu
             }
-
+            List<BomChildExamineDto> returnlist = new List<BomChildExamineDto>();
             //var query = (await _ic_bom.GetQueryableAsync()).WhereIf(true, a => a.bom_id == BomId).ToList();
             var help = new SnowFlake();
+            var bom = bomlist.Find(s => s.Id == BomId);
+            if (bom == null)
+            {
+                return returnlist;
+            }
             
-            List<BomChildExamineDto> returnlist = new List<BomChildExamineDto>();
             var dto = new BomChildExamineDto();
+            dto.item_id = bom.icitem_id;
             dto.bom_id = BomId.Value;
             dto.level = 1;
             dto.id = help.NextId();
@@ -1019,16 +1024,23 @@ namespace Business.ResourceExamineManagement
         /// <param name="returnlist"></param>
         public void GetBomList(List<ic_bom> bomlist, List<ic_bom_child> bomchildlist, List<ic_item> icitemlist, BomChildExamineDto dto, List<BomChildExamineDto> returnlist, int type)
         {
-            int level = dto.level++;//初始化定义level层级
+            int level = dto.level + 1;//初始化定义level层级
             var help = new SnowFlake();
 
-            var bom = bomlist.WhereIf(true, s => s.Id == dto.bom_id).FirstOrDefault();
-            var item = icitemlist.WhereIf(true, a => a.Id == bom.icitem_id).FirstOrDefault();
-            if (bom == null || item == null)
+            var bom = bomlist.Where(s => s.Id == dto.bom_id).FirstOrDefault();
+            ic_item item = new ic_item();
+            if (bom != null)
             {
-
+                item = icitemlist.Where(a => a.Id == bom.icitem_id).FirstOrDefault();
             }
-            dto.item_id = bom.icitem_id;
+            else {
+                item = icitemlist.Where(a => a.Id == dto.item_id).FirstOrDefault();
+            }
+            if (item == null)
+            {
+                return;
+            }
+            dto.item_id = item.Id;
             dto.item_name = bom.item_name;
             dto.item_code = bom.item_number;
             dto.model = item.model;