From c8ff2a9c5682bfddc0a0f58d09974b5165113d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Thu, 6 Jun 2024 17:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FeeRecordController.cs        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs
index 1e4a0b1a..0935ff26 100644
--- a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs
+++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs
@@ -1,6 +1,5 @@
 using DS.Module.Core;
 using DS.Module.Core.Data;
-using DS.Module.Core.Extensions;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Fee.Interface;
@@ -20,7 +19,6 @@ namespace DS.WMS.FeeApi.Controllers
         /// 构造函数
         /// </summary>
         /// <param name="feeService"></param>
-        /// <param name="flowService"></param>
         public FeeRecordController(IFeeRecordService feeService)
         {
             _feeService = feeService;
@@ -65,7 +63,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("Submit")]
         public async Task<DataResult> SubmitAsync([FromBody] FeeRecordSubmit recordSubmit)
         {
-            if (recordSubmit == null || recordSubmit.Items.IsNullOrEmpty())
+            if (recordSubmit == null || recordSubmit.Items == null)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             if (recordSubmit.Items.Any(x => x.FeeStatus != FeeStatus.Entering && x.FeeStatus != FeeStatus.RejectSubmission))
@@ -88,7 +86,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("CreateByTemplate")]
         public async Task<DataResult> CreateByTemplateAsync([FromBody] FeeRecordByTemplate request)
         {
-            if (request == null || request.TemplateIdList.Length == 0)
+            if (request == null || request.TemplateIdList?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.CreateByTemplateAsync(request.BusinessId, request.BusinessType, request.TemplateIdList);
@@ -102,7 +100,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("Delete")]
         public async Task<DataResult> DeleteAsync([FromBody] IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.DeleteAsync(model.Ids);
@@ -116,7 +114,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("ApplyAudit")]
         public async Task<DataResult> ApplyAuditAsync([FromBody] IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.SubmitForApprovalAsync(FeeAuditType.ApplyAudit, model.Remark, model.Ids);
@@ -130,7 +128,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("ApplyDeletion")]
         public async Task<DataResult> ApplyDeletionAsync([FromBody] IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.SubmitForApprovalAsync(FeeAuditType.ApplyDeletion, model.Remark, model.Ids);
@@ -144,7 +142,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("ApplyModification")]
         public async Task<DataResult> ApplyModificationAsync([FromBody] IEnumerable<FeeModification> items)
         {
-            if (items.IsNullOrEmpty())
+            if (items == null || !items.Any())
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.SubmitForModificationAsync(items);
@@ -158,7 +156,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("Withdraw")]
         public async Task<DataResult> WithdrawAsync([FromBody] IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.WithdrawAsync(model.Ids);
@@ -186,7 +184,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("GetPrintInfo")]
         public async Task<DataResult<CostAccountingForm>> GetPrintInfoAsync(IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult<CostAccountingForm>.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _feeService.GetPrintInfoAsync((BusinessType)model.BusinessType, model.Ids);
@@ -200,7 +198,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("SetInvoiceEnabled")]
         public async Task<DataResult> SetInvoiceEnabledAsync(IdModel model)
         {
-            if (model == null || model.Ids.Length == 0)
+            if (model == null || model.Ids?.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             bool enabled = Convert.ToBoolean(model.Value);