From 7893a1fb6ed585b9f88e02cc4f133392b7249e5f Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Fri, 9 Sep 2022 14:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89sql=E7=9A=84=E8=A1=A8=E6=9B=BF=E6=8D=A2,[#tableName#]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java |  3 ++-
 .../system/bpm/web/engine/dynPage/DynPageLoadHandler.java      |  2 +-
 .../cc/smtweb/framework/core/cache/redis/RedisSysTask.java     |  2 --
 .../src/main/java/cc/smtweb/framework/core/util/SqlUtil.java   | 10 +++++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

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 d805477..8ec90f0 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
@@ -14,6 +14,7 @@ import cc.smtweb.framework.core.exception.SwException;
 import cc.smtweb.framework.core.mvc.service.SqlNamedPara;
 import cc.smtweb.framework.core.util.MapUtil;
 import cc.smtweb.framework.core.util.NumberUtil;
+import cc.smtweb.framework.core.util.SqlUtil;
 import cc.smtweb.framework.core.util.StringUtil;
 import cc.smtweb.system.bpm.web.design.form.define.*;
 import org.apache.commons.lang3.StringUtils;
@@ -187,7 +188,7 @@ public class DynPageHelper {
             if (listener != null) listener.buildSelect(dataSet, sql);
             return sql.toString();
         } else {
-            return dataSet.sql;
+            return SqlUtil.replaceTable(dataSet.sql);
         }
     }
 
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
index c024f6a..c030db5 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
@@ -104,7 +104,7 @@ public class DynPageLoadHandler extends AbstractDynPageHandler {
         SwMap filter = params.readMap("filter");
         //对应的数据集定义
         PageDataset pageDataSet = readParamDs();
-
+        
         DynRetBean bean = null;
         if (SwEnum.DatasetType.LIST.value.equals(pageDataSet.type)) {//列表类
             bean = DynRetBean.createList(getListWorker(filter, pageDataSet).buildListData());
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/redis/RedisSysTask.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/redis/RedisSysTask.java
index c7d9ce4..5042292 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/redis/RedisSysTask.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/redis/RedisSysTask.java
@@ -38,8 +38,6 @@ public class RedisSysTask implements ISysTask {
                         RedisBroadcastEvent redisBroadcast = JsonUtil.parse(message, RedisBroadcastEvent.class);
 
                         applicationContext.publishEvent(redisBroadcast);
-
-//          log.debug("Redis [" + channel + "] message:" + redisBroadcast);
                     }
                 });
 
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/SqlUtil.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/SqlUtil.java
index fe54704..58cb618 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/SqlUtil.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/SqlUtil.java
@@ -3,6 +3,7 @@ package cc.smtweb.framework.core.util;
 import cc.smtweb.framework.core.common.AbstractEnum;
 import cc.smtweb.framework.core.common.IntEnum;
 import cc.smtweb.framework.core.common.StrEnum;
+import cc.smtweb.framework.core.db.EntityHelper;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -22,7 +23,14 @@ public abstract class SqlUtil {
      * @return
      */
     public static String replaceTable(String sql) {
-        return sql;
+        return StringUtil.myReplaceStrEx(sql, "[#", "#]", new StringUtil.IStrHanlder() {
+            @Override
+            public String work(String src) {
+                src = src.toUpperCase();
+                return EntityHelper.getSchemaTableName(src);
+            }
+        });
+
     }
 
     /**