Compare commits

...

3 Commits

Author SHA1 Message Date
lichao 5ffa1b7d50 11 2026-04-23 09:37:08 +08:00
lichao ac6efd332b Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2026-04-23 09:37:02 +08:00
lichao da4f6b1b4a 11 2026-04-23 09:36:47 +08:00
2 changed files with 6 additions and 6 deletions
@@ -67,13 +67,13 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
return (from x in getDataList
select new
{
x.CheckingId, x.ProjectId, x.UnitId, x.UnitName, x.PersonId,
x.PersonName, x.CardNo, x.IdentityCard, x.WorkAreaId, x.WorkAreaName,
x.IntoOut, x.IntoOutTime, x.Address,
};
}).ToList();
}
#endregion
+4 -4
View File
@@ -338,10 +338,10 @@ namespace FineUIPro.Web
}
}
if (BLL.SQLHelper.GetConn().State == ConnectionState.Open)
{
BLL.SQLHelper.GetConn().Close();
}
//if (BLL.SQLHelper.GetConn().State == ConnectionState.Open)
//{
// BLL.SQLHelper.GetConn().Close();
//}
}
private bool IsSystemTheme(string themeName)