From ebb8c874a161d1bd54f16668e48711a7e0f43ccb Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Mon, 26 Sep 2022 10:07:23 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E9=9D=9E=E6=B3=95=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/smtweb/system/bpm/web/common/BpmEnum.java     |  2 ++
 .../system/bpm/web/engine/dynPage/DynPageHelper.java | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

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<String, IBuilderExpr> 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<String, IBuilderExpr> mapBuilder;
-    private static IBuilderExpr baseBuilder;
-
     /**
      * 构建数据权限
      * @param dsType 数据权限定义ID