From d4603a95e959d368540f2b4d43429d38d105a1fe Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Sat, 26 Nov 2022 14:40:57 +0800
Subject: [PATCH] Code optimization

---
 .../ResolveItems/NewArrayExpessionResolve.cs  | 68 +++++++++++--------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/NewArrayExpessionResolve.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/NewArrayExpessionResolve.cs
index 2ad08a93c..e4ec450d0 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/NewArrayExpessionResolve.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/NewArrayExpessionResolve.cs
@@ -20,9 +20,10 @@ namespace SqlSugar
                 case ResolveExpressType.SelectMultiple:
                 case ResolveExpressType.FieldSingle:
                 case ResolveExpressType.FieldMultiple:
+                    #region Filed
                     try
                     {
-                       var value = ExpressionTool.DynamicInvoke(expression);
+                        var value = ExpressionTool.DynamicInvoke(expression);
                         var isLeft = parameter.IsLeft;
                         var baseParameter = parameter.BaseParameter;
                         var isSetTempData = baseParameter.CommonTempData.HasValue() && baseParameter.CommonTempData.Equals(CommonTempDataType.Result);
@@ -64,41 +65,52 @@ namespace SqlSugar
                     catch (Exception)
                     {
                         Check.ThrowNotSupportedException("NewArrayExpression");
-                    }
+                    } 
+                    #endregion
                     break;
                 case ResolveExpressType.ArraySingle:
-                    foreach (var item in expression.Expressions)
-                    {
-                        base.Expression = item;
-                        base.Start();
-                    }
+                    ArraySingle(expression);
                     break;
                 case ResolveExpressType.Join:
-                    base.Context.ResolveType = ResolveExpressType.WhereMultiple;
-                    int i = 0;
-                    foreach (var item in expression.Expressions)
+                    Join(parameter, expression);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void Join(ExpressionParameter parameter, NewArrayExpression expression)
+        {
+            base.Context.ResolveType = ResolveExpressType.WhereMultiple;
+            int i = 0;
+            foreach (var item in expression.Expressions)
+            {
+                if (item is UnaryExpression)
+                {
+                    base.Expression = item;
+                    base.Start();
+                    if (parameter.CommonTempData is JoinType)
                     {
-                        if (item is UnaryExpression)
+                        if (i > 0)
                         {
-                            base.Expression = item;
-                            base.Start();
-                            if (parameter.CommonTempData is JoinType)
-                            {
-                                if (i > 0)
-                                {
-                                    base.Context.Result.Append("," + parameter.CommonTempData.ObjToString().Replace(",",UtilConstants.ReplaceCommaKey) + ",");
-                                }
-                                else
-                                {
-                                    base.Context.Result.Append(parameter.CommonTempData.ObjToString().Replace(",", UtilConstants.ReplaceCommaKey) + ",");
-                                }
-                                ++i;
-                            }
+                            base.Context.Result.Append("," + parameter.CommonTempData.ObjToString().Replace(",", UtilConstants.ReplaceCommaKey) + ",");
                         }
+                        else
+                        {
+                            base.Context.Result.Append(parameter.CommonTempData.ObjToString().Replace(",", UtilConstants.ReplaceCommaKey) + ",");
+                        }
+                        ++i;
                     }
-                    break;
-                default:
-                    break;
+                }
+            }
+        }
+
+        private void ArraySingle(NewArrayExpression expression)
+        {
+            foreach (var item in expression.Expressions)
+            {
+                base.Expression = item;
+                base.Start();
             }
         }
     }