fix: 收敛旧模块资源释放与诊断
This commit is contained in:
@@ -913,6 +913,14 @@ namespace Lskj.Control.Model
|
||||
/// <param name="key">The key.</param>
|
||||
/// <returns>DataTable.</returns>
|
||||
public static DataTable GetCustomColumnByDatabase(this GridView gridView, string key)
|
||||
{
|
||||
return GetCustomColumnByDatabase(key);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取个性配置列数据,不依赖任何界面控件。
|
||||
/// </summary>
|
||||
public static DataTable GetCustomColumnByDatabase(string key)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -954,18 +962,7 @@ namespace Lskj.Control.Model
|
||||
{
|
||||
BaseImpl.ExecSqlValue("alter table " + ResourceKeys.SettingTableName + " add IfFixColumn bit");
|
||||
}
|
||||
// 读取普通用户读取个人配置,没有则读取管理员配置,管理未配置则读取系统默认.逐级上报读取方式.
|
||||
string sqlValue = string.Format("select * from {0} where formKey='{1}' and operatorid='{2}' order by orderid ", ResourceKeys.SettingTableName, key, ERPInfo.Instance.UserId);
|
||||
|
||||
DataTable table = BaseImpl.GetDataTableResult(sqlValue);
|
||||
|
||||
//if (table == null || table.Rows.Count == 0)
|
||||
//{
|
||||
// sqlValue = string.Format("select * from {0} where formKey='{1}' and operatorid='{2}'", ResourceKeys.SettingTableName, key, ERPInfo.Instance.UserManager);
|
||||
// table = BaseImpl.GetDataTableResult(sqlValue);
|
||||
//}
|
||||
|
||||
return table;
|
||||
return GetCustomColumnByDatabase(key);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user