表单列表：过滤条件添加、表单虚拟列代码优化

lst
1 parent 2cd3ef07
Showing 2 changed files with 23 additions and 9 deletions Show diff stats
backend/chkpower/src/main/resources/mapper/WFinanceDetailMapper.xml
backend/form/src/main/java/com/hotent/form/persistence/manager/impl/FormDataTemplateManagerImpl.java
@@ -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>
@@ -2041,13 +2041,25 @@ public class FormDataTemplateManagerImpl extends BaseManagerImpl&lt;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&lt;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);
+			}
         }
     }
...	...	@@ -53,7 +53,7 @@
53	53	FROM
54	54	w_finance_detail w_finance_detail
55	55	WHERE
56		- LENGTH( F_income ) != 0 and F_income != 0
	56	+ F_income != 0 and F_income is not null and F_income != ''
57	57	<if test="orgId != null and orgId != ''">
58	58	and w_finance_detail.F_org_id = #{orgId}
59	59	</if>
...	...	@@ -68,7 +68,7 @@
68	68	FROM
69	69	w_finance_detail w_finance_detail
70	70	WHERE
71		- LENGTH( F_disbursement ) != 0 and F_disbursement != 0
	71	+ F_disbursement != 0 and F_disbursement is not null and F_disbursement != ''
72	72	<if test="orgId != null and orgId != ''">
73	73	and w_finance_detail.F_org_id = #{orgId}
74	74	</if>
...	...
...	...	@@ -2041,13 +2041,25 @@ public class FormDataTemplateManagerImpl extends BaseManagerImpl<FormDataTemplat
2041	2041	break;
2042	2042	case 5: //流程权限
2043	2043	sql = getFlowPermissionSql(jsonObject.get("condition").asText(), boEnt);
2044		-
	2044	+ case 8:// 追加SQL
	2045	+ String filterSql1 = jsonObject.get("condition").asText();
	2046	+ filterSql1 = filterSql1.replaceAll("\\n", " ");
	2047	+ sql = executeScript(filterSql1, param);
	2048	+ break;
	2049	+ case 9://数据权限
	2050	+ sql = getDataPermissionSql(jsonObject.get("condition").asText(), "");
	2051	+ break;
2045	2052	}
2046	2053	if (StringUtil.isNotEmpty(sql)) {
2047	2054	if (sb.length() == 0) {
2048	2055	sb.append(" AND (( ");
2049	2056	} else {
2050		- sb.append(" OR (");
	2057	+ // 8 追加SQL(and) 数据权限(and)
	2058	+ if(type==8 \|\|type==9){
	2059	+ sb.append(" AND (");
	2060	+ }else{
	2061	+ sb.append(" OR (");
	2062	+ }
2051	2063	}
2052	2064	sb.append(sql);
2053	2065	sb.append(" ) ");
...	...	@@ -3098,11 +3110,13 @@ public class FormDataTemplateManagerImpl extends BaseManagerImpl<FormDataTemplat
3098	3110	merge.add(displayField);
3099	3111	}
3100	3112	} else {
3101		- HashSet<String> set = new HashSet<>();
3102		- map.put(displayField.getTableName(), set);
3103		- set.add(displayField.getOldTableField());
3104		- merge.add(displayField);
3105		- }
	3113	+ if(StringUtil.isNotEmpty(displayField.getTableName())){
	3114	+ HashSet<String> set = new HashSet<>();
	3115	+ map.put(displayField.getTableName(), set);
	3116	+ set.add(displayField.getOldTableField());
	3117	+ }
	3118	+ merge.add(displayField);
	3119	+ }
3106	3120	}
3107	3121	}
3108	3122
...	...