|
@@ -144,7 +144,8 @@ public class DynPageHelper { |
|
|
buildSelectSql(dataSet, params, sqlNamedPara, null); |
|
|
buildSelectSql(dataSet, params, sqlNamedPara, null); |
|
|
return sqlNamedPara; |
|
|
return sqlNamedPara; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static Map<String, IBuilderExpr> mapBuilder; |
|
|
|
|
|
private static IBuilderExpr baseBuilder; |
|
|
static { |
|
|
static { |
|
|
baseBuilder = (opt, field, name, value, args, filter) -> { |
|
|
baseBuilder = (opt, field, name, value, args, filter) -> { |
|
|
args.put(name, value); |
|
|
args.put(name, value); |
|
@@ -180,13 +181,13 @@ public class DynPageHelper { |
|
|
args.put(name, value); |
|
|
args.put(name, value); |
|
|
return field + " not in (:" + name + ") "; |
|
|
return field + " not in (:" + name + ") "; |
|
|
}); |
|
|
}); |
|
|
mapBuilder.put(SwEnum.OptType.IN_CHILD.value, (opt, field, name, value, args, filter) -> { |
|
|
|
|
|
ModelTable table = ModelTableCache.getInstance().get(filter.link); |
|
|
|
|
|
if(table==null){ |
|
|
|
|
|
return ""; |
|
|
|
|
|
} |
|
|
|
|
|
return TreeHelper.getTreeHelper(table.getName()).buildLikeFrSql(Long.parseLong(value.toString()),field); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// mapBuilder.put(SwEnum.OptType.IN_CHILD.value, (opt, field, name, value, args, filter) -> { |
|
|
|
|
|
// ModelTable table = ModelTableCache.getInstance().get(filter.link); |
|
|
|
|
|
// if(table==null){ |
|
|
|
|
|
// return ""; |
|
|
|
|
|
// } |
|
|
|
|
|
// return TreeHelper.getTreeHelper(table.getName()).buildLikeFrSql(Long.parseLong(value.toString()),field); |
|
|
|
|
|
// }); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private static String buildSelFieldsSql(PageDataset dataSet, SqlNamedPara sqlNamedPara, IBuildSqlListener listener) { |
|
|
private static String buildSelFieldsSql(PageDataset dataSet, SqlNamedPara sqlNamedPara, IBuildSqlListener listener) { |
|
@@ -363,9 +364,6 @@ public class DynPageHelper { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private static Map<String, IBuilderExpr> mapBuilder; |
|
|
|
|
|
private static IBuilderExpr baseBuilder; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 构建数据权限 |
|
|
* 构建数据权限 |
|
|
* @param dsType 数据权限定义ID |
|
|
* @param dsType 数据权限定义ID |
|
|