cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r1103

Browse Source 
SVN-Revision: r1103
This commit is contained in:
cyf
2026-01-30 07:38:00 +00:00
parent ddaf751b19
commit 5ccfe15fee
12 changed files with 258 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Business/Impl/MainImpl.cs
+28 -19
View File
@@ -471,13 +471,15 @@ namespace Lskj.Business.Impl
string fields = string.Empty;
if (!string.IsNullOrWhiteSpace(userId))
sqlWhere = string.Format(" and EmployeeId='{0}'", userId);
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
//if (HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
// fields += ",DefaultLedger";
@@ -501,16 +503,17 @@ namespace Lskj.Business.Impl
string conditions = string.Empty;
string fields = string.Empty;
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
if (HasExistsColumn("P_EmployeeTab", "mestig"))
if (dataTable.Columns.Contains("mestig"))
{
conditions = "and mestig=1";
}
@@ -538,14 +541,18 @@ namespace Lskj.Business.Impl
string fields = string.Empty;
if (!string.IsNullOrWhiteSpace(userId))
sqlWhere = string.Format(" and EmployeeId='{0}'", userId);
if (HasExistsColumn("P_EmployeeTab", "SignBmp"))
DataTable dataTable = GetTableColumns("P_EmployeeTab");
if (dataTable.Columns.Contains("SignBmp"))
fields = ",SignBmp";
if (HasExistsColumn("P_EmployeeTab", "Password"))
if (dataTable.Columns.Contains("Password"))
fields += ",Password";
if (HasExistsColumn("P_EmployeeTab", "AD_Id"))
if (dataTable.Columns.Contains("AD_Id"))
fields += ",AD_Id";
if (HasExistsColumn("P_EmployeeTab", "useLanguage"))
if (dataTable.Columns.Contains("useLanguage"))
fields += ",useLanguage";
//if (HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
// fields += ",DefaultLedger";
@@ -643,38 +650,40 @@ namespace Lskj.Business.Impl
// 获取权限
condWhere = GetPurviewCond();
}
if (HasExistsColumn("P_FormMenuConfigTab", "useFlag"))
DataTable dataTable = GetTableColumns("P_FormMenuConfigTab");
if (dataTable.Columns.Contains("useFlag"))
{
// 获取可用菜单标识
condWhere += " and isnull(useFlag,0)=1";
}
if (HasExistsColumn("P_FormMenuConfigTab", "TargetMode"))
if (dataTable.Columns.Contains("TargetMode"))
{
// 获取CS端显示标识(0 全部、1cs、 2 手机、3、bs)
condWhere += " and isnull(TargetMode,0) in (0,1)";
}
string fields = string.Empty, field = string.Empty;
if (HasExistsColumn("p_formmenuconfigtab", "menuRow"))
if (dataTable.Columns.Contains("menuRow"))
{
fields += ",menuRow";
field += "a.menuRow,";
}
if (HasExistsColumn("p_formmenuconfigtab", "menuposition"))
if (dataTable.Columns.Contains("menuposition"))
{
fields += ",isnull(menuposition,0)";
field += "isnull(a.menuposition,0) as menuposition,";
}
if (HasExistsColumn("p_formmenuconfigtab", "GroupCaption"))
if (dataTable.Columns.Contains("GroupCaption"))
{
fields += ",GroupCaption";
field += "a.GroupCaption,";
}
string SeriesConds = string.Empty; string SeriesCond = string.Empty;
if (HasExistsColumn("P_FormMenuConfigTab", "SeriesId") && !string.IsNullOrEmpty(ERPInfo.Instance.SeriesId))
if (dataTable.Columns.Contains("SeriesId") && !string.IsNullOrEmpty(ERPInfo.Instance.SeriesId))
{
SeriesConds = ",SeriesId";
SeriesCond = "a.SeriesId,";
}
string countSqlconditions = string.Empty;
string countSql = string.Empty;
if (SystemInfo.Instance.BillCornerMark && HasExistsColumn("P_systemdlltab", "countSql") && HasExistsColumn("p_systembilltype", "countSql"))