SVN r923

SVN-Revision: r923
2025-08-07 09:20:25 +00:00
parent 25e9863964
commit f7a53010be
9 changed files with 376 additions and 34 deletions
@@ -938,6 +938,14 @@ namespace Lskj.Business.Impl
            {
                field += ",ImportCurrentValue";
            }
+            if (HasExistsColumn("p_systembillsourcecond", "UnionFields"))
+            {
+                field += ",UnionFields";
+            }
+            if (HasExistsColumn("p_systembillsourcecond", "UnionValue"))
+            {
+                field += ",UnionValue";
+            }
            string sqlValue = string.Format(@"select id,controlLeft,controlTop,controlWidth,controlHeight,controlType as fieldTypeId,controlName as fieldName,controlLabel as userName,'' DataFormat,
 	                                   defaultValue,sourceSql as lookupSql,keyField as lookupKeyField,resultField as lookupResult,edited,checkCond,InputHintText{0}
                                from p_systembillsourcecond