From 68a383fa0760759c871e3ac9dd593de0ecd2b5a8 Mon Sep 17 00:00:00 2001
From: yaoq <Yaoq@92827>
Date: Thu, 8 Sep 2022 16:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java  | 3 ++-
 .../java/cc/smtweb/framework/core/db/cache/ModelTableCache.java     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java
index 104e94c..7c1d9e1 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java
@@ -8,6 +8,7 @@ import cc.smtweb.framework.core.db.DbEngine;
 import cc.smtweb.framework.core.db.EntityDao;
 import cc.smtweb.framework.core.db.vo.ModelDatabase;
 import cc.smtweb.framework.core.db.vo.ModelProject;
+import cc.smtweb.framework.core.util.CommUtil;
 import cc.smtweb.framework.core.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,7 +39,7 @@ public class ModelDatabaseCache extends AbstractCache<ModelDatabase> {
         EntityDao<ModelDatabase> dao = DbEngine.getInstance().findDao(ModelDatabase.class);
         if (StringUtils.isEmpty(SwConsts.SysParam.RUN_PROJECTS))
             return dao.query();
-        return dao.queryEx(" inner join " + ModelProject.ENTITY_NAME + " on db_prj_id=prj_id where prj_module in (" + StringUtil.join(SwConsts.SysParam.RUN_PROJECTS.split(","), ",") + ")");
+        return dao.queryEx(" inner join " + ModelProject.ENTITY_NAME + " on db_prj_id=prj_id where prj_module in (" + CommUtil.getSqlInStr(SwConsts.SysParam.RUN_PROJECTS.split(",")) + ")");
     }
 
     public final ModelDatabase getByName(String key) {
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
index ac7fe84..1e2b2be 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
@@ -8,7 +8,7 @@ import cc.smtweb.framework.core.db.DbEngine;
 import cc.smtweb.framework.core.db.vo.ModelField;
 import cc.smtweb.framework.core.db.vo.ModelProject;
 import cc.smtweb.framework.core.db.vo.ModelTable;
-import cc.smtweb.framework.core.util.StringUtil;
+import cc.smtweb.framework.core.util.CommUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.ResultSetExtractor;
@@ -54,7 +54,7 @@ public class ModelTableCache extends AbstractCache<ModelTable> {
     protected List<ModelTable> loadAll() {
         String sql;
         if (!StringUtils.isEmpty(SwConsts.SysParam.RUN_PROJECTS)) {
-            sql = " inner join " + ModelProject.ENTITY_NAME + " on tb_prj_id=prj_id where prj_module in (" + StringUtil.join(SwConsts.SysParam.RUN_PROJECTS.split(","), ",") + ")";
+            sql = " inner join " + ModelProject.ENTITY_NAME + " on tb_prj_id=prj_id where prj_module in (" + CommUtil.getSqlInStr(SwConsts.SysParam.RUN_PROJECTS.split(",")) + ")";
         } else sql = "";
         return DbEngine.getInstance().query("SELECT\n" +
                 "t.tb_id,\n" +
@@ -122,7 +122,7 @@ public class ModelTableCache extends AbstractCache<ModelTable> {
 
     public final String getTableName(long id) {
         ModelTable bean = get(id);
-        return bean == null ? String.valueOf(id) : bean.getTitle();
+        return bean == null ? String.valueOf(id): bean.getTitle();
     }
 
     //根据外键