浏览代码

jfinal 3.6

James 7 年之前
父节点
当前提交
cb2f71dcd5

+ 9 - 1
src/main/java/com/jfinal/plugin/activerecord/Db.java

@@ -670,7 +670,15 @@ public class Db {
     public static SqlPara getSqlPara(String key, Object... paras) {
     	return MAIN.getSqlPara(key, paras);
     }
-    
+	
+	public static SqlPara getSqlParaByString(String content, Map data) {
+		return MAIN.getSqlParaByString(content, data);
+	}
+	
+	public static SqlPara getSqlParaByString(String content, Object... paras) {
+		return MAIN.getSqlParaByString(content, paras);
+	}
+	
     public static List<Record> find(SqlPara sqlPara) {
     	return MAIN.find(sqlPara);
     }

+ 9 - 1
src/main/java/com/jfinal/plugin/activerecord/DbPro.java

@@ -1285,7 +1285,15 @@ public class DbPro {
     public SqlPara getSqlPara(String key, Object... paras) {
     	return config.getSqlKit().getSqlPara(key, paras);
     }
-    
+	
+	public SqlPara getSqlParaByString(String content, Map data) {
+		return config.getSqlKit().getSqlParaByString(content, data);
+	}
+	
+	public SqlPara getSqlParaByString(String content, Object... paras) {
+		return config.getSqlKit().getSqlParaByString(content, paras);
+	}
+	
     public List<Record> find(SqlPara sqlPara) {
     	return find(sqlPara.getSql(), sqlPara.getPara());
     }

+ 0 - 6
src/main/java/com/jfinal/plugin/activerecord/sql/SqlKit.java

@@ -218,9 +218,6 @@ public class SqlKit {
 	 */
 	public SqlPara getSqlParaByString(String content, Map data) {
 		Template template = engine.getTemplateByString(content);
-		if (template == null) {
-			return null;
-		}
 		
 		SqlPara sqlPara = new SqlPara();
 		data.put(SQL_PARA_KEY, sqlPara);
@@ -242,9 +239,6 @@ public class SqlKit {
 	 */
 	public SqlPara getSqlParaByString(String content, Object... paras) {
 		Template template = engine.getTemplateByString(content);
-		if (template == null) {
-			return null;
-		}
 		
 		SqlPara sqlPara = new SqlPara();
 		Map data = new HashMap();