Merge branch 'kitchenmanage' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.Manage into kitchenmanage

BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

@@ -583,15 +583,17 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                     GoodsUintName = SqlFunc.Subqueryable<BPA_GoodsUint>().Where(s => s.Id == a.GoodsUintId && s.IsDeleted == 0).Select(s => s.Name),
                     //GoodsAttributeList = new List<GoodsAttributeList>()
                 }).FirstAsync();
-            if (!res.IsAttrubute)
+            if (res!=null)
             {
-                res.GoodsAttributeList = await _goodsAttributeService.GetByNameAttribute("默认属性");
-            }
-            else
-            {
-                res.GoodsAttributeList = await _goodsAttributeService.GetByGoodsIdAttribute(res.Id);
+                if (!res.IsAttrubute)
+                {
+                    res.GoodsAttributeList = await _goodsAttributeService.GetByNameAttribute("默认属性");
+                }
+                else
+                {
+                    res.GoodsAttributeList = await _goodsAttributeService.GetByGoodsIdAttribute(res.Id);
+                }
             }
-
             return res;
         }
         public async Task<bool> ExportGood(IFormFile file)