diff --git a/src/main/java/com/dev/energy/server/action/QueryAction.java b/src/main/java/com/dev/energy/server/action/QueryAction.java index a36dc8e..0dd57e9 100644 --- a/src/main/java/com/dev/energy/server/action/QueryAction.java +++ b/src/main/java/com/dev/energy/server/action/QueryAction.java @@ -273,7 +273,7 @@ public class QueryAction extends AbstractAction implements ApplicationContextAwa } Map params = tableConfig.getParams(); - for (Object key : params.keySet()) { + /* for (Object key : params.keySet()) { Object param=params.get(key); String param_str=param.toString(); if(param_str.indexOf("%")==0){ @@ -281,7 +281,7 @@ public class QueryAction extends AbstractAction implements ApplicationContextAwa log.info("替换------"+key.toString()+"====="+param_str+"--"+param_str.indexOf("%")); } - } + }*/ diff --git a/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java b/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java index 9130bd9..9568521 100644 --- a/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java +++ b/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java @@ -224,8 +224,12 @@ return translator.getSQLString(); String dateString = sdf.format(parm); hql=hql.replace("{"+ketstr+"}", dateString); }else{ - - hql=hql.replace("{"+ketstr+"}", parm.toString().replaceAll(" ", "")); + String param_str=parm.toString(); + param_str=param_str.trim(); + if(param_str.indexOf("%")==0){ + param_str=param_str.substring(1); + } + hql=hql.replace("{"+ketstr+"}", param_str); } }