Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r34089 -r34090
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 34089)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 34090)
@@ -1136,7 +1136,7 @@
 			//新篮筐要判断是否可以回收
 			if(CssdUtils.getSystemSetConfigByNameBool("recycleClassifyBasketAfterPacked",true)){
 				boolean isNewClassifyBasket = true;
-				if(record !=null){
+				if(record !=null && record.getClassifyBaskets() != null){
 					for (ClassifyBasket basket : record.getClassifyBaskets()) {
 						if (StringUtils.equals(basket.getContainerBarcode(),container.getBarcode())) {
 							isNewClassifyBasket = false;
@@ -8883,7 +8883,7 @@
 		if (container != null && container.isCleanBasket()) {
 			RecyclingRecord recyclingRecord = get(recyclingRecordId);
 			
-			if (recyclingRecord != null) {
+			if (recyclingRecord != null && recyclingRecord.getClassifyBaskets() != null) {
 				for (ClassifyBasket basket : recyclingRecord.getClassifyBaskets()) {
 					if (StringUtils.equals(basket.getContainerBarcode(),container.getBarcode())) {
 						classifyBasket = basket;