diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml
index ce5fadf56..d85c010ba 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml	
@@ -64,7 +64,7 @@
                 <input id="fromHeight" type="text" class="form-control" placeholder="请输入高" value="400" />
             </div>
             <div class="col-xs-12 lr-form-item">
-                <div class="lr-form-item-title">请填写Sql语句<font face="宋体">*</font></div>
+                <div class="lr-form-item-title">条件筛选Sql语句<font face="宋体">*</font></div>
                 <textarea id="F_CloseDoSql" class="form-control" style="height: 60px" placeholder="请填写Sql语句" isvalid="yes" checkexpession="NotNull"></textarea>
             </div>
             <div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js
index 883981420..4eefbb4dd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js	
@@ -366,19 +366,18 @@ var bootstrap = function ($, learun) {
 
                     $('#step-1').lrSetFormData(data.module);
                     $('#F_FormId').lrselectSet(data.relation.F_FormId);
-
+                    $("#F_CloseDoSql").val(data.relation.F_CloseDoSql);
                     var settingJson = JSON.parse(data.relation.F_SettingJson);
                     $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked');
                     $('#fromWidth').val(settingJson.layer.width);
                     $('#fromHeight').val(settingJson.layer.height);
-
                     $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked');
                     $('#queryDatetime').lrselectSet(settingJson.query.DateField);
                     $('#queryWidth').val(settingJson.query.width);
                     $('#queryHeight').val(settingJson.query.height);
 
                     queryData = settingJson.query.fields;
-                    console.log(queryData);
+                    
                     $('#query_girdtable').jfGridSet('refreshdata', queryData);
 
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js
index 5bd0c94fa..49678ffae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js	
@@ -15,6 +15,7 @@ var relation;
 var mainTablePk = "";
 var mainTable = "";
 var mainCompontId = "";
+var sqlwhere = "";
 
 var bootstrap = function ($, learun) {
     "use strict";
@@ -28,7 +29,7 @@ var bootstrap = function ($, learun) {
                 relation = data.relation;
                 settingJson = JSON.parse(data.relation.F_SettingJson);
                 formScheme = JSON.parse(data.scheme.F_Scheme);
-
+                sqlwhere = relation.F_CloseDoSql;
                 for (var i = 0, l = formScheme.dbTable.length; i < l; i++) {
                     var tabledata = formScheme.dbTable[i];
                     if (tabledata.relationName == "") {
@@ -305,6 +306,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            if (!!sqlwhere) {
+                queryJson.sqlwhere = sqlwhere;
+            }
             param.queryJson = JSON.stringify(queryJson);
             $('#gridtable').jfGridSet('reload', param);
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs
index 1e3296b7e..1948b9075 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs	
@@ -902,6 +902,11 @@ namespace Learun.Application.Form
                     queryParamTemp.Add("lrend", queryParam["lrend"].ToDate());
                     querySql += " AND (" + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " >=@lrbegin AND " + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " <=@lrend ) ";
                 }
+                //自定义sql查询条件
+                else if (queryParam != null && !queryParam["sqlwhere"].IsEmpty())
+                {
+                    querySql += " "+ queryParam["sqlwhere"].ToString();
+                }
                 else if (queryParam != null) // 复合条件查询
                 {
                    
@@ -932,7 +937,7 @@ namespace Learun.Application.Form
                 {
                     queryParam.Add(item.Key, item.Value);
                 }
-
+                
 
                 return querySql;
             }