Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
===================================================================
diff -u -r27459 -r27461
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 27459)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java	(.../TousseIntoBasketService.java)	(revision 27461)
@@ -303,8 +303,10 @@
 		}
 		if(CollectionUtils.isNotEmpty(needQueryBarcodes)){
 			List<ClassifyBasket> needQueryBaskets = classifyBasketManager.getUnWashedBaskets(needQueryBarcodes);
-			for (ClassifyBasket needQueryBasket : needQueryBaskets) {
-				classifyBasketMap.put(needQueryBasket.getContainerBarcode(), needQueryBasket);
+			if(CollectionUtils.isNotEmpty(needQueryBaskets)){
+				for (ClassifyBasket needQueryBasket : needQueryBaskets) {
+					classifyBasketMap.put(needQueryBasket.getContainerBarcode(), needQueryBasket);
+				}
 			}
 			baskets.addAll(needQueryBaskets);
 		}
@@ -325,8 +327,10 @@
 			//已经查询过的 不再查询了
 			if(CollectionUtils.isNotEmpty(tdIds)){
 				List<TousseDefinition> needQueryTds = tousseDefinitionManager.getCollection(tdIds);
-				for (TousseDefinition needQueryTd : needQueryTds) {
-					tdMap.put(needQueryTd.getId(), needQueryTd);
+				if(CollectionUtils.isNotEmpty(needQueryTds)){
+					for (TousseDefinition needQueryTd : needQueryTds) {
+						tdMap.put(needQueryTd.getId(), needQueryTd);
+					}
 				}
 				tds.addAll(needQueryTds);
 			}