SVN r1244

SVN-Revision: r1244
2026-06-30 02:05:39 +00:00
parent 7154f3e0fd
commit 627b05c39b
1 changed files with 7 additions and 0 deletions
@@ -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