From bbafa4e9d8a43648f6e5e453f25fde35ea037a34 Mon Sep 17 00:00:00 2001
From: kevin <1985088337@qq.com>
Date: Thu, 20 May 2021 10:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A9=E5=B1=95=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OSS.Common/BasicMos/Resp/RespExtension.cs | 92 ++++++++++++-----------
 OSS.Common/OSS.Common.csproj              |  6 +-
 2 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/OSS.Common/BasicMos/Resp/RespExtension.cs b/OSS.Common/BasicMos/Resp/RespExtension.cs
index 06d0533..6ff150d 100644
--- a/OSS.Common/BasicMos/Resp/RespExtension.cs
+++ b/OSS.Common/BasicMos/Resp/RespExtension.cs
@@ -189,40 +189,6 @@ namespace OSS.Common.BasicMos.Resp
             return string.IsNullOrEmpty(errMsg) ? res : res.WithErrMsg(errMsg);
         }
 
-        /// <summary>
-        /// 处理响应转化
-        /// </summary>
-        /// <param name="res"></param>
-        /// <param name="tPara"></param>
-        /// <param name="func"></param>
-        /// <param name="errMsg">如果 tPara.IsSuccess()=false，且errMsg不为空，取errMsg，否则取 tPara.msg </param>
-        /// <typeparam name="TRes"></typeparam>
-        /// <typeparam name="TPara"></typeparam>
-        /// <returns></returns>
-        public static Resp<TRes> WithResp<TRes, TPara>(this Resp<TRes> res, Resp<TPara> tPara,
-             Func<TPara, TRes> func,string errMsg = null)
-        {            
-            res.data = func.Invoke(tPara.data);
-            return res.WithResp(tPara, errMsg);
-        }
-
-        /// <summary>
-        /// 处理响应转化
-        /// </summary>
-        /// <typeparam name="TRes"></typeparam>
-        /// <typeparam name="TPara"></typeparam>
-        /// <param name="res"></param>
-        /// <param name="tPara"></param>
-        /// <param name="func"></param>
-        /// <param name="errMsg">不成功时的消息内容，如果为空,消息内容取 tPara.msg</param>
-        /// <returns></returns>
-        public static ListResp<TRes> WithResp<TRes, TPara>(this ListResp<TRes> res, ListResp<TPara> tPara,
-            Func<TPara, TRes> func, string errMsg = null)
-        {            
-            res.data = tPara.data?.Select(func).ToList();
-            return res.WithResp(tPara, errMsg);
-        }
-
         /// <summary>
         /// 处理响应转化
         /// </summary>
@@ -238,29 +204,65 @@ namespace OSS.Common.BasicMos.Resp
             return string.IsNullOrEmpty(errMsg) ? res : res.WithErrMsg(errMsg);
         }
 
+        #region 附带 data 转化处理
+
         /// <summary>
         /// 处理响应转化
         /// </summary>
         /// <param name="res"></param>
         /// <param name="tPara"></param>
-        /// <param name="func"></param>
-        /// <param name="isNullCheck">是否检查参数 data 为空</param>
+        /// <param name="convertFunc"></param>
+        /// <param name="errMsg">如果 tPara.IsSuccess()=false，且errMsg不为空，取errMsg，否则取 tPara.msg </param>
+        /// <param name="isNullCheck">调用方法（convertFunc）之前是否检查数据是否为空</param>
         /// <typeparam name="TRes"></typeparam>
         /// <typeparam name="TPara"></typeparam>
         /// <returns></returns>
-        [Obsolete]
         public static Resp<TRes> WithResp<TRes, TPara>(this Resp<TRes> res, Resp<TPara> tPara,
-             Func<TPara, TRes> func, bool isNullCheck = true)
+             Func<TPara, TRes> convertFunc, string errMsg, bool isNullCheck = true)
         {
-            WithResp(res, tPara.sys_ret, tPara.ret, tPara.msg);
-
-            if (isNullCheck && tPara.data == null)
-                return  res ;
-
-            res.data = func.Invoke(tPara.data);
-            return res;
+            if ((isNullCheck && tPara.data != null)
+                || !isNullCheck)
+            {
+                res.data = convertFunc.Invoke(tPara.data);
+            }
+            return res.WithResp(tPara, errMsg);
         }
 
+        /// <summary>
+        /// 处理响应转化
+        /// </summary>
+        /// <param name="res"></param>
+        /// <param name="tPara"></param>
+        /// <param name="convertFunc"></param>
+        /// <param name="isNullCheck">调用方法（convertFunc）之前是否检查数据是否为空</param>
+        /// <typeparam name="TRes"></typeparam>
+        /// <typeparam name="TPara"></typeparam>
+        /// <returns></returns>
+        public static Resp<TRes> WithResp<TRes, TPara>(this Resp<TRes> res, Resp<TPara> tPara,
+           Func<TPara, TRes> convertFunc, bool isNullCheck=true)
+        {
+            return res.WithResp(tPara, convertFunc, null, isNullCheck);
+        }
+
+        /// <summary>
+        /// 处理响应转化
+        /// </summary>
+        /// <typeparam name="TRes"></typeparam>
+        /// <typeparam name="TPara"></typeparam>
+        /// <param name="res"></param>
+        /// <param name="tPara"></param>
+        /// <param name="convertFunc"></param>
+        /// <param name="errMsg">不成功时的消息内容，如果为空,消息内容取 tPara.msg</param>
+        /// <returns></returns>
+        public static ListResp<TRes> WithResp<TRes, TPara>(this ListResp<TRes> res, ListResp<TPara> tPara,
+            Func<TPara, TRes> convertFunc, string errMsg = null)
+        {
+            res.data = tPara.data?.Select(convertFunc).ToList();
+            return res.WithResp(tPara, errMsg);
+        }
+
+        #endregion
+
         #endregion
 
         /// <summary>
diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj
index a01a92e..ccbed46 100644
--- a/OSS.Common/OSS.Common.csproj
+++ b/OSS.Common/OSS.Common.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Version>2.3.3</Version>
+    <Version>2.3.3.2</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>OSSCore</Authors>
     <Company>OSSCore</Company>
@@ -14,8 +14,8 @@
     <RepositoryUrl>https://github.com/KevinWG/OSS.Common</RepositoryUrl>
 
     <PackageReleaseNotes>添加结果处理扩展函数</PackageReleaseNotes>
-    <AssemblyVersion>2.3.3.0</AssemblyVersion>
-    <FileVersion>2.3.3.0</FileVersion>
+    <AssemblyVersion>2.3.3.2</AssemblyVersion>
+    <FileVersion>2.3.3.2</FileVersion>
 
     <PackageLicenseUrl>https://github.com/KevinWG/OSS.Common/blob/master/LICENSE</PackageLicenseUrl>