Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r12749 -r12756 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12749) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12756) @@ -935,7 +935,7 @@ + DatabaseUtil.getSqlLengthFunctionName(dbConnection) + "(po.name) asc"; List> diposableGoodsList = diposableGoodsManager - .getDiposableGoodsList(sql,showReferencePrice); + .getDisposableGoodsList(sql,showReferencePrice , null); mapList = diposableGoodsList; } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r12738 -r12756 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12738) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12756) @@ -325,6 +325,7 @@ * @throws Exception */ public String getDiposableGoodsData() { + spell = spell == null ? "" : spell; if (spell != null) { try { spell = java.net.URLDecoder.decode(spell, "UTF-8");