增加排序多库支持写法，支持desc、asc关键字

表名、列名不正确直接抛异常

Admin.NET/Admin.NET.Core/Service/APIJSON/APIJSONService.cs

@@ -119,7 +119,8 @@ public class APIJSONService : IDynamicApiController, ITransient
             var dt = new Dictionary<string, object>();
             foreach (var f in JObject.Parse(item.Value.ToString()))
             {
-                if (f.Key.ToLower() != "id" && _selectTable.IsCol(key, f.Key) && (role.Insert.Column.Contains("*") || role.Insert.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase)))
+                if (f.Key.ToLower() != "id" &&
+                    _selectTable.IsCol(key, f.Key) && (role.Insert.Column.Contains("*") || role.Insert.Column.Contains(f.Key, StringComparer.CurrentCultureIgnoreCase)))
                     dt.Add(f.Key, f.Value);
             }
             //todo 自定义id
@@ -182,7 +183,7 @@ public class APIJSONService : IDynamicApiController, ITransient
         foreach (var item in jobject)//每个表执行一次
         {
             string talbeName = item.Key.Trim();
-            var value = JObject.Parse(item.Value.ToString());//"id":""            
+            var value = JObject.Parse(item.Value.ToString());           
             
             if (role.Delete == null || role.Delete.Table == null)
             {
@@ -208,7 +209,7 @@ public class APIJSONService : IDynamicApiController, ITransient
                     parameters.Add(new SugarParameter($"@{f.Key}", paraArray));
                     //sb.Append($"{f.Key} in ({f.Value.ToString().TrimStart("[").TrimEnd("]").TrimInvisible()})  and");
                 }
-                else
+                else//单个值
                 {
                     sb.Append($"{f.Key}=@{f.Key} and ");
                     parameters.Add(new SugarParameter($"@{f.Key}", FuncList.TransJObjectToSugarPara(f.Value)));

Admin.NET/Admin.NET.Core/Service/APIJSON/FuncList.cs

@@ -51,26 +51,7 @@ public class FuncList
     {
         return a.ToString().Split(',').Contains(b);
     }
-    /// <summary>
-    /// 获取JToken的数据类型，用于SugarParameter里的类型转换
-    /// </summary>
-    /// <param name="jToken"></param>
-    /// <returns></returns>
-    public static Type GetTypeFromJToken(JToken jToken)
-    {
-        JTokenType jTokenType = jToken.Type;
-        return jTokenType switch
-        {
-            JTokenType.Integer => typeof(long),
-            JTokenType.Float => typeof(decimal),
-            JTokenType.Boolean => typeof(bool),
-            JTokenType.Date => typeof(DateTime),
-            JTokenType.Bytes => typeof(byte),
-            JTokenType.Guid => typeof(Guid),
-            JTokenType.TimeSpan => typeof(TimeSpan),
-            _ => jToken.GetType(),
-        };
-    }
+   
 
     /// <summary>
     /// 根据jtoken的实际类型来转换SugarParameter，避免全转成字符串

Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs

@@ -10,6 +10,7 @@
 namespace Admin.NET.Core.Service;
 
 using AspectCore.Extensions.Reflection;
+using NewLife.Data;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Schema;
 using SqlSugar;
@@ -41,23 +42,30 @@ public class SelectTable : ISingleton
         db = dbClient;
     }
     /// <summary>
-    /// 判断表名是否正确
+    /// 判断表名是否正确，如果不正确则抛异常
     /// </summary>
     /// <param name="table"></param>
     /// <returns></returns>
     public virtual bool IsTable(string table)
     {
-        return db.DbMaintenance.GetTableInfoList().Any(it => it.Name.Equals(table, StringComparison.CurrentCultureIgnoreCase));
+        if (db.DbMaintenance.GetTableInfoList().Any(it => it.Name.Equals(table, StringComparison.CurrentCultureIgnoreCase)))
+            return true;
+        else
+            throw new Exception($"表名【{table}】不正确！");
+
     }
     /// <summary>
-    /// 判断表的列名是否正确
+    /// 判断表的列名是否正确,如果不正确则抛异常，更早地暴露给调用方
     /// </summary>
     /// <param name="table"></param>
     /// <param name="col"></param>
     /// <returns></returns>
     public virtual bool IsCol(string table, string col)
     {
-        return db.DbMaintenance.GetColumnInfosByTableName(table).Any(it => it.DbColumnName.Equals(col, StringComparison.CurrentCultureIgnoreCase));
+        if (db.DbMaintenance.GetColumnInfosByTableName(table).Any(it => it.DbColumnName.Equals(col, StringComparison.CurrentCultureIgnoreCase)))
+            return true;
+        else
+            throw new Exception($"表【{table}】不存在列【{col}】！请检查输入参数");
     }
 
     /// <summary>
@@ -148,7 +156,7 @@ public class SelectTable : ISingleton
             {
                 ExecFunc(resultObj, item);
             }
-            else if (key.Equals("total@")|| key.Equals("total"))
+            else if (key.Equals("total@") || key.Equals("total"))
             {
                 resultObj.Add("total", total);
             }
@@ -437,10 +445,8 @@ public class SelectTable : ISingleton
     //
     private ISugarQueryable<ExpandoObject> sugarQueryable(string subtable, string selectrole, JObject values, JObject dd)
     {
-        if (!IsTable(subtable))
-        {
-            throw new Exception($"表名{subtable}不正确！");
-        }
+        IsTable(subtable);
+
         var tb = db.Queryable(subtable, "tb");
 
 
@@ -545,7 +551,7 @@ public class SelectTable : ISingleton
                 //不对函数加``,解决sum(*),Count(1)等不能使用的问题
                 else if (ziduan[0].Contains('('))
                 {
-                    str.Append( ziduan[0]+ ",");
+                    str.Append(ziduan[0] + ",");
                 }
                 else
                     str.Append("`" + ziduan[0] + "`" + ",");
@@ -649,25 +655,24 @@ public class SelectTable : ISingleton
     {
         if (values["@order"].HasValue())
         {
+            List<OrderByModel> orderList = new(); //多库兼容写法
             foreach (var item in values["@order"].ToString().Split(','))
             {
-                string col = item.Replace("-", "").Replace("+", "");
+                string col = item.Replace("-", "").Replace("+", "").Replace(" desc", "").Replace(" asc", "");//增加对原生排序的支持
                 if (IsCol(subtable, col))
                 {
-                    if (item.EndsWith("-"))
-                    {
-                        tb.OrderBy($"{col} desc");
-                    }
-                    else if (item.EndsWith("+"))
-                    {
-                        tb.OrderBy($"{col} asc");
-                    }
-                    else
+                    orderList.Add(new OrderByModel()
                     {
-                        tb.OrderBy($"{col}");
-                    }
+                        FieldName = col,
+                        OrderByType = item.EndsWith("-") || item.EndsWith(" desc") ? OrderByType.Desc : OrderByType.Asc
+                    });
                 }
             }
+
+            if (orderList.Any())
+            {
+                tb.OrderBy(orderList);
+            }
         }
     }