Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r17991 -r18065
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 17991)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 18065)
@@ -1292,8 +1292,13 @@
 								useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 								objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 								
-								//生成预回收记录
-								tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+								List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+										getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+								//如果预回收项不为空时,保存预回收记录
+								if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+									//生成预回收记录
+									tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+								}
 							}
 						}
 					}else{
@@ -1348,7 +1353,10 @@
 								//构造与生成预回收相关的数据
 								list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount()));
 							}
-							tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+							//如果预回收项不为空时,保存预回收记录
+							if(CollectionUtils.isNotEmpty(list)){
+								tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+							}
 						}
 					}
 				}else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){
@@ -1370,8 +1378,13 @@
 							useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 							objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 							
-							//生成预回收记录
-							tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+							List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+									getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+							//如果预回收项不为空时,保存预回收记录
+							if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+								//生成预回收记录
+								tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+							}
 						}
 					}
 				}
@@ -1431,8 +1444,13 @@
 								useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 								objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 								
-								//生成预回收记录
-								tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+								List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+										getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+								//如果预回收项不为空时,保存预回收记录
+								if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+									//生成预回收记录
+									tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+								}
 							}
 						}
 					}else{
@@ -1487,7 +1505,10 @@
 								//构造与生成预回收相关的数据
 								list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount()));
 							}
-							tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+							//如果预回收项不为空时,保存预回收记录
+							if(CollectionUtils.isNotEmpty(list)){
+								tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+							}
 						}
 					}
 				}else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){
@@ -1508,8 +1529,13 @@
 							useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 							objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 							
-							//生成预回收记录
-							tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+							List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+									getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+							//如果预回收项不为空时,保存预回收记录
+							if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+								//生成预回收记录
+								tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+							}
 						}
 					}
 				}
@@ -1570,8 +1596,13 @@
 							useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 							objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 							
-							//生成预回收记录
-							tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+							List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+									getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+							//如果预回收项不为空时,保存预回收记录
+							if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+								//生成预回收记录
+								tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+							}
 						}
 					}
 				}else{
@@ -1625,7 +1656,10 @@
 							//构造与生成预回收相关的数据
 							list.add(tousseTransitionPlanItemManager.build(item.getTousseItemId(), item.getAmount(), item.getUrgentAmount()));
 						}
-						tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+						//如果预回收项不为空时,保存预回收记录
+						if(CollectionUtils.isNotEmpty(list)){
+							tousseTransitionPlanManager.save(useRecord, recyclingApplication, list, true);
+						}
 					}
 				}
 			}else if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART.equals(useRecordConvertRecyclingApplicationMergeRegular)){
@@ -1647,8 +1681,13 @@
 						useRecordConvertRecyclingApplication.setUseRecordId(useRecordId);
 						objectDao.saveOrUpdate(useRecordConvertRecyclingApplication);
 						
-						//生成预回收记录
-						tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false) , false);
+						List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+								getTousseTransitionPlanItemListByRecyclingApplication(newRecyclingApplication , false);
+						//如果预回收项不为空时,保存预回收记录
+						if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+							//生成预回收记录
+							tousseTransitionPlanManager.save(useRecord, newRecyclingApplication, tousseTransitionPlanItemList , false);
+						}
 					}
 				}
 			}
@@ -1707,8 +1746,14 @@
 		
 		if(CollectionUtils.isNotEmpty(list)){
 			for (RecyclingApplication recyclingApplication : list) {
-				//生成预回收记录
-				tousseTransitionPlanManager.save(useRecord, recyclingApplication, getTousseTransitionPlanItemListByRecyclingApplication(recyclingApplication , false) , false);
+				
+				List<TousseTransitionPlanItem> tousseTransitionPlanItemList = 
+						getTousseTransitionPlanItemListByRecyclingApplication(recyclingApplication , false) ;
+				//如果预回收项不为空时,保存预回收记录
+				if(CollectionUtils.isNotEmpty(tousseTransitionPlanItemList)){
+					//生成预回收记录
+					tousseTransitionPlanManager.save(useRecord, recyclingApplication,tousseTransitionPlanItemList , false);
+				}
 			}
 		}
 	}