SVN-Revision: r530
This commit is contained in:
tdx
2025-04-30 09:20:44 +00:00
parent c584d9c5fb
commit c9ed5492b4
+7 -2
View File
@@ -558,8 +558,12 @@ namespace Lskj.Control
/// <param name="where">The where key.</param> /// <param name="where">The where key.</param>
protected void SetMainGridView(string where = "") protected void SetMainGridView(string where = "")
{ {
ModuleGridDetailEx moduleGridDetailEx = this.MainBodyTab.Visible ? (this.MainBodyTab.SelectedTabPage.Tag as ModuleGridDetailEx) : null;
string sqlValue = ReplaceHelper.ReplaceWhereCond(this.MainBodyTab.Visible ? (this.MainBodyTab.SelectedTabPage.Tag as ModuleGridDetailEx).SysModel.MenuSql : this.SysModel.MenuSql); string sqlValue = ReplaceHelper.ReplaceWhereCond(moduleGridDetailEx!=null? moduleGridDetailEx.SysModel.MenuSql : this.SysModel.MenuSql);
if (moduleGridDetailEx != null && moduleGridDetailEx.Tag is DataRow dataRow)
{
sqlValue += dataRow["unionCond"];
}
//sqlValue = this.SysModel.MenuSql.Trim().StartsWith("select", StringComparison.OrdinalIgnoreCase) ? sqlValue + where : sqlValue; //sqlValue = this.SysModel.MenuSql.Trim().StartsWith("select", StringComparison.OrdinalIgnoreCase) ? sqlValue + where : sqlValue;
//判断是否是select开头,上方的判断可能出现开头是空格或者注释的情况 //判断是否是select开头,上方的判断可能出现开头是空格或者注释的情况
sqlValue = IsSelectAtStart(sqlValue) ? sqlValue + where : sqlValue; sqlValue = IsSelectAtStart(sqlValue) ? sqlValue + where : sqlValue;
@@ -1626,6 +1630,7 @@ namespace Lskj.Control
GridDragGrid.GridAddCheckBox(modegridEx.ModuleGridObj.GridControlObj.GridView); GridDragGrid.GridAddCheckBox(modegridEx.ModuleGridObj.GridControlObj.GridView);
} }
page.Controls.Add(modegridEx); page.Controls.Add(modegridEx);
modegridEx.Tag = item;
page.Tag = modegridEx; page.Tag = modegridEx;
this.MainBodyTab.TabPages.Add(page); this.MainBodyTab.TabPages.Add(page);
} }