diff --git a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
index f08c235..91e8143 100644
--- a/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
@@ -53,7 +53,7 @@
 		FROM
 			w_finance_detail w_finance_detail
 		WHERE
-		LENGTH( F_income ) != 0 and F_income != 0
+		F_income != 0 and F_income is not null and F_income != ''
 		<if test="orgId != null and orgId != ''">
 			and w_finance_detail.F_org_id = #{orgId}
 		</if>
@@ -68,7 +68,7 @@
 		FROM
 		w_finance_detail w_finance_detail
 		WHERE
-		LENGTH( F_disbursement ) != 0 and F_disbursement != 0
+		F_disbursement != 0 and F_disbursement is not null and F_disbursement != ''
 		<if test="orgId != null and orgId != ''">
 			and w_finance_detail.F_org_id = #{orgId}
 		</if>
diff --git a/backend/form/src/main/java/com/hotent/form/persistence/manager/impl/FormDataTemplateManagerImpl.java b/backend/form/src/main/java/com/hotent/form/persistence/manager/impl/FormDataTemplateManagerImpl.java
index edc1e45..c7f9f1d 100644
--- a/backend/form/src/main/java/com/hotent/form/persistence/manager/impl/FormDataTemplateManagerImpl.java
+++ b/backend/form/src/main/java/com/hotent/form/persistence/manager/impl/FormDataTemplateManagerImpl.java
@@ -2041,13 +2041,25 @@ public class FormDataTemplateManagerImpl extends BaseManagerImpl<FormDataTemplat
 					break;
 				case 5: //流程权限
 					sql = getFlowPermissionSql(jsonObject.get("condition").asText(), boEnt);
-
+				case 8:// 追加SQL
+					String filterSql1 = jsonObject.get("condition").asText();
+					filterSql1 = filterSql1.replaceAll("\\n", "  ");
+					sql = executeScript(filterSql1, param);
+					break;
+				case 9://数据权限
+					sql = getDataPermissionSql(jsonObject.get("condition").asText(), "");
+					break;
 			}
 			if (StringUtil.isNotEmpty(sql)) {
 				if (sb.length() == 0) {
 					sb.append(" AND (( ");
 				} else {
-					sb.append(" OR (");
+					// 8 追加SQL(and) 数据权限(and)
+					if(type==8 ||type==9){
+						sb.append(" AND (");
+					}else{
+						sb.append(" OR (");
+					}
 				}
 				sb.append(sql);
 				sb.append(" ) ");
@@ -3098,11 +3110,13 @@ public class FormDataTemplateManagerImpl extends BaseManagerImpl<FormDataTemplat
                     merge.add(displayField);
                 }
             } else {
-                HashSet<String> set = new HashSet<>();
-                map.put(displayField.getTableName(), set);
-                set.add(displayField.getOldTableField());
-                merge.add(displayField);
-            }
+				if(StringUtil.isNotEmpty(displayField.getTableName())){
+					HashSet<String> set = new HashSet<>();
+					map.put(displayField.getTableName(), set);
+					set.add(displayField.getOldTableField());
+				}
+				merge.add(displayField);
+			}
         }
     }
 
--
libgit2 0.21.2