From 61e646f821996cb702117a9747f55b9eaadb97bc Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 11 七月 2024 08:50:06 +0800
Subject: [PATCH] 返回结果调整

---
 Wms/Utility/Extension/ApiResponseActionFilter.cs |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Wms/Utility/Extension/ApiResponseActionFilter.cs b/Wms/Utility/Extension/ApiResponseActionFilter.cs
index 6f73a0c..5802b58 100644
--- a/Wms/Utility/Extension/ApiResponseActionFilter.cs
+++ b/Wms/Utility/Extension/ApiResponseActionFilter.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Utility.Entity;
+using Utility.Extension;
 
 namespace Utility
 {
@@ -21,16 +22,22 @@
             // 鍦ㄦ墽琛屽姩浣滀箣鍚庣殑閫昏緫
             if (resultContext.Result is ObjectResult objectResult)
             {
-                var apiResponse = new ApiResponse<object>(
-                context.HttpContext.Response.StatusCode,
-                context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
-                objectResult.Value);
-
-                //if (resultContext.Result is SqlSugarPagedList)
-                //{
-                //    apiResponse.count = ((SqlSugarPagedList)resultContext.Result).Total;
-                //}
-
+                ApiResponse<object> apiResponse;
+                if (objectResult.Value is SqlSugarPagedList)
+                {
+                    apiResponse = new ApiResponse<object>(
+                    context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
+                    context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
+                    ((SqlSugarPagedList)objectResult.Value).Items,
+                    ((SqlSugarPagedList)objectResult.Value).Total);
+                }
+                else
+                {
+                    apiResponse = new ApiResponse<object>(
+                    context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
+                    context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
+                    objectResult.Value);
+                }
                 var json = JsonConvert.SerializeObject(apiResponse);
                 context.HttpContext.Response.ContentType = "application/json";
                 context.HttpContext.Response.ContentLength = Encoding.UTF8.GetByteCount(json);
@@ -40,7 +47,7 @@
             if (resultContext.Result is EmptyResult)
             {
                 var apiResponse = new ApiResponse<object>(
-                    context.HttpContext.Response.StatusCode,
+                    context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
                     context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
                     "璇锋眰鎴愬姛"
                 );

--
Gitblit v1.8.0