Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r40550 -r40559
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 40550)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 40559)
@@ -2215,7 +2215,9 @@
 	 */
 	private void syncSupplierContact(String supplierName, String returneeOfSupplier, String returneeOfSupplierPhoneNumber) {
 		SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj();
-		if(!StringUtils.equals(systemParamsObj.getSyncReturnRecipientInfo(), SupplyRoomConfig.SYNC_RETURN_RECIPIENT_INFO_YES)){
+		if(!StringUtils.equals(systemParamsObj.getSyncReturnRecipientInfo(), SupplyRoomConfig.SYNC_RETURN_RECIPIENT_INFO_YES)
+				|| !StringUtils.equals(systemParamsObj.getDisplayRecipientPhoneNumber(), Constants.STR_YES)){
+			//字段“显示归还接收人联系电话”设置为”是“;
 			//字段“归还时同步归还接收人信息”被设置为“启用;
 			//归还时，若字段“归还接收人”中的值不存在于当前归还的供应商信息中，则提交保存时，同步在对应的供应商的“联系人列表”中自动添加一个该用户
 			return;
@@ -2224,13 +2226,17 @@
 		if(supplier == null){
 			return;
 		}
+		if(StringUtils.isBlank(returneeOfSupplierPhoneNumber)){
+			throw new SystemException("联系电话不能为空！");
+		}
 		SupplierContact supplierContact = null;
 		List<SupplierContact> supplierContactList = supplier.getSupplierContact();
 		if(CollectionUtils.isNotEmpty(supplierContactList)){
 			for (SupplierContact supplierContact2 : supplierContactList) {
 				if(StringUtils.equals(supplierContact2.getContactName(), returneeOfSupplier)){
 					supplierContact = supplierContact2;
-					break;
+				}else if(StringUtils.equals(returneeOfSupplierPhoneNumber, supplierContact2.getPhoneNumber())){
+					throw new SystemException(String.format("已包含相同电话号:%s,不可重复添加!", returneeOfSupplierPhoneNumber));
 				}
 			}
 		}
@@ -2241,10 +2247,7 @@
 			supplierContact.setWbCode(GB2WB.getWBCode(returneeOfSupplier));
 			supplierContact.setSpelling(GB2Alpha.string2Alpha(returneeOfSupplier));
 		}
-		if(StringUtils.equals(systemParamsObj.getDisplayRecipientPhoneNumber(), Constants.STR_YES)){
-			//若字段“显示归还接收人联系电话”设置为“是”，则保存时将字段“联系电话”中的值保存为本次新增用户信息中的字段“电话”中；
-			supplierContact.setPhoneNumber(returneeOfSupplierPhoneNumber);
-		}
+		supplierContact.setPhoneNumber(returneeOfSupplierPhoneNumber);
 		objectDao.saveOrUpdate(supplierContact);
 	}