|
|
@@ -115,6 +115,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
sqlstr = sqlstr.Replace(m.Value, dicVals[fieldName]);
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sqlstr = sqlstr.Replace(m.Value, "");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
DataTable dtsub = CustomerSqlConn.dtable(sqlstr, MysqlConn.ReadSqlConnStr);
|
|
|
@@ -149,6 +153,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string fieldName = fieldData[0];
|
|
|
sql = sql.Replace(m.Value, Request.Query[fieldName].ToString());
|
|
|
}
|
|
|
+ mc = Regex.Matches(sql, @"\#\{.*?\}\#");
|
|
|
+ foreach(Match m in mc)
|
|
|
+ {
|
|
|
+ string fieldName = m.Value.Replace("#{", "").Replace("}#", "");
|
|
|
+ if(dicVals.ContainsKey(fieldName))
|
|
|
+ {
|
|
|
+ sql = sql.Replace(m.Value, dicVals[fieldName]);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sql = sql.Replace(m.Value, "");
|
|
|
+ }
|
|
|
+ }
|
|
|
mc = Regex.Matches(sql, @"\$\replace{.*?\}\$");
|
|
|
foreach(Match m in mc)
|
|
|
{
|