Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r25490 -r25551 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 25490) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 25551) @@ -3266,7 +3266,7 @@ @SuppressWarnings("unchecked") Collection returnGoodsRecords = objectDao.findBySql( - ReturnGoodsRecord.class.getSimpleName(), null, firstIndex, + ReturnGoodsRecord.class.getSimpleName(), " where handleDepartCode='"+ AcegiHelper.getCurrentOrgUnitCode() +"'", firstIndex, maxResultCount, "returnTime desc"); Gson gson = new GsonBuilder().setDateFormat(defaultDateFormat2)