From 12df4e40e4547f665c30c5396c08f11cdc343e83 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Tue, 26 Dec 2023 16:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs | 3 ++-
 src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs   | 7 ++++---
 src/WMS.Web.Repositories/OutStockRepositories.cs        | 6 ++++--
 src/WMS.Web.Repositories/OutStockTaskRepositories.cs    | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index d9dcfb58..f20606bc 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -125,7 +125,8 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.Creator))
             {
                 var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
-                ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
+                if (staffList != null)
+                    ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
             }
 
             var materials_result = await _erpService.BillQueryForMaterial();
diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
index 49ada4f0..b12b46f4 100644
--- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
@@ -108,7 +108,7 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<(List<MoveBoxRecordQueryInfoResponse> list, int total)> GetListAsync(MoveBoxRecordQueryRequest dto, int companyId=0)
+        public async Task<(List<MoveBoxRecordQueryInfoResponse> list, int total)> GetListAsync(MoveBoxRecordQueryRequest dto, int companyId = 0)
         {
             if (companyId == 0)
                 companyId = _loginRepositories.CompanyId;
@@ -116,7 +116,8 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.Creator))
             {
                 var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
-                ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
+                if (staffList != null)
+                    ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
             }
 
             var query = _context.MoveBoxRecord
@@ -160,7 +161,7 @@ namespace WMS.Web.Repositories
 
         public async Task<(object obj, int total)> GetListField(MoveBoxRecordQueryRequest dto, int companyId)
         {
-            return await GetListAsync(dto,companyId);
+            return await GetListAsync(dto, companyId);
         }
     }
 }
diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs
index 7dd17da1..4fba096c 100644
--- a/src/WMS.Web.Repositories/OutStockRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockRepositories.cs
@@ -91,7 +91,8 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.Creator))
             {
                 var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
-                ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
+                if (staffList != null)
+                    ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
             }
             #region erp基础资料
             List<int> mIds = new List<int>();
@@ -100,7 +101,8 @@ namespace WMS.Web.Repositories
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
             {
-                mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
+                if (materials != null)
+                    mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
             }
 
             //取组织
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 6949aa77..735511d4 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -227,7 +227,8 @@ namespace WMS.Web.Repositories
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
             {
-                mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
+                if (materials != null)
+                    mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
             }
 
             //取组织