Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r13062 -r13482
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 13062)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 13482)
@@ -172,7 +172,7 @@
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r13469 -r13482
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13469)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13482)
@@ -881,7 +881,11 @@
boolean onlySearchRecyclingTousse,boolean showReferencePrice,
String pageIndex, String countOfLI, boolean showDisableGoods,
boolean showExternalCodeOfDisposableGoods,String handleDepartCode) {
-
+ // 有些输入法会输入"'",要过滤掉,不过滤执行sql会报异常
+ if(StringUtils.isNotBlank(simpleSpell))
+ {
+ simpleSpell = simpleSpell.replace("'", "");
+ }
String sql = createQuerySQL(simpleSpell);
if (onlySearchRecyclingTousse){