diff --git a/插件库/Lskj.BaseInfo/FrmMain.cs b/插件库/Lskj.BaseInfo/FrmMain.cs index f1ae6e2..6833156 100644 --- a/插件库/Lskj.BaseInfo/FrmMain.cs +++ b/插件库/Lskj.BaseInfo/FrmMain.cs @@ -516,6 +516,13 @@ namespace Lskj.BaseInfo { sqlValue = ReplaceHelper.ReplaceWhereCond(sqlValue) + string.Format(" and {0}='{1}'", model.UnionValue, unionPatentValue); } + + if (!string.IsNullOrEmpty(model.UnionCond)) + { + string UnionCond = ReplaceHelper.ReplaceRowParam(this._currentControlSource, model.UnionCond); + sqlValue += UnionCond; + } + return sqlValue; } #endregion