修复sql错误导致程序崩溃的问题
This commit is contained in:
@@ -300,8 +300,8 @@ public class DataBaseManager : IDataBaseManager, ITransient
|
||||
{
|
||||
if (link != null && _sqlSugarClient.CurrentConnectionConfig.ConfigId != link.Id) _sqlSugarClient = ChangeDataBase(link);
|
||||
|
||||
try
|
||||
{
|
||||
//try
|
||||
//{
|
||||
int total = 0;
|
||||
|
||||
if (_sqlSugarClient.CurrentConnectionConfig.DbType == SqlSugar.DbType.Oracle) strSql = strSql.Replace(";", string.Empty);
|
||||
@@ -316,7 +316,7 @@ public class DataBaseManager : IDataBaseManager, ITransient
|
||||
if (pageInput.superQueryJson.IsNotEmptyOrNull()) superQueryJson = _sqlSugarClient.Utilities.JsonToConditionalModels(pageInput.superQueryJson);
|
||||
// var sql = _sqlSugarClient.SqlQueryable<object>(strSql)
|
||||
// .Where(querJson).Where(superQueryJson).Where(dataPermissions).ToSqlString();
|
||||
DataTable dt = _sqlSugarClient.CopyNew().SqlQueryable<object>(strSql)
|
||||
DataTable dt = _sqlSugarClient.SqlQueryable<object>(strSql)
|
||||
.Where(querJson).Where(superQueryJson).Where(dataPermissions)
|
||||
.OrderByIF(sidx, pageInput.sidx + " " + pageInput.sort).OrderByIF(!sidx && defaultSidx, columnDesign.defaultSidx + " " + columnDesign.sort)
|
||||
.ToDataTablePage(pageInput.currentPage, pageInput.pageSize, ref total);
|
||||
@@ -339,11 +339,11 @@ public class DataBaseManager : IDataBaseManager, ITransient
|
||||
},
|
||||
list = dt.ToObject<List<Dictionary<string, string>>>().ToObject<List<Dictionary<string, object>>>()
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// throw;
|
||||
//}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -419,7 +419,7 @@ WHERE pcolumn.table_name='{0}' ORDER BY ordinal_position";
|
||||
{
|
||||
if (link != null && _sqlSugarClient.CurrentConnectionConfig.ConfigId != link.Id) _sqlSugarClient = ChangeDataBase(link);
|
||||
|
||||
return _sqlSugarClient.CopyNew().DbMaintenance.GetPrimaries(tableName);
|
||||
return _sqlSugarClient.DbMaintenance.GetPrimaries(tableName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1106,6 +1106,13 @@ public enum ErrorCode
|
||||
[ErrorCodeItemMetadata("该流程已发起,无法删除")]
|
||||
D1417,
|
||||
|
||||
/// <summary>
|
||||
/// 该功能不存在,可能已被删除.
|
||||
/// </summary>
|
||||
[ErrorCodeItemMetadata("该功能( id: {0} )不存在,可能已被删除")]
|
||||
D1418,
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region 数据建模 15
|
||||
|
||||
Reference in New Issue
Block a user