diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java index b19f7c9..2489030 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java @@ -29,6 +29,8 @@ public interface BpmEnum { public static MenuFuncRight instance = new MenuFuncRight(); public static StrEnumBean READ = instance.addEnum("read", "查看"); public static StrEnumBean WRITE = instance.addEnum("write", "修改"); + public static StrEnumBean EXPORT = instance.addEnum("export", "导出"); + public static StrEnumBean AUDIT = instance.addEnum("audit", "审核"); } class UserStatu extends IntEnum { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java index 8813be6..a43a477 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java @@ -144,7 +144,8 @@ public class DynPageHelper { buildSelectSql(dataSet, params, sqlNamedPara, null); return sqlNamedPara; } - + private static Map mapBuilder; + private static IBuilderExpr baseBuilder; static { baseBuilder = (opt, field, name, value, args, filter) -> { args.put(name, value); @@ -180,13 +181,13 @@ public class DynPageHelper { args.put(name, value); 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) { @@ -363,9 +364,6 @@ public class DynPageHelper { } } - private static Map mapBuilder; - private static IBuilderExpr baseBuilder; - /** * 构建数据权限 * @param dsType 数据权限定义ID