Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r40465 -r40466
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40465)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40466)
@@ -1235,10 +1235,11 @@
 			List<String> useRecordConvertRecyclingApplicationNotMergeDeptCodeList = new ArrayList<String>();
 			try{
 				JSONArray useRecordConvertRecyclingApplicationNotMergeDeptCodeArray = JSONArray.fromObject(useRecordConvertRecyclingApplicationNotMergeDeptCodes);
-				if(CollectionUtils.isNotEmpty(useRecordConvertRecyclingApplicationNotMergeDeptCodeArray) && StringUtils.equals(useRecordConvertRecyclingApplicationMergeRegular, "depart")){
+				if(CollectionUtils.isNotEmpty(useRecordConvertRecyclingApplicationNotMergeDeptCodeArray)){
 					useRecordConvertRecyclingApplicationNotMergeDeptCodeList.addAll(useRecordConvertRecyclingApplicationNotMergeDeptCodeArray);
-					if(useRecordConvertRecyclingApplicationNotMergeDeptCodeList.contains(recyclingApplication.getUseRecord().getDepartCoding())){
-						useRecordSql = " and po.useRecord.id = " + recyclingApplication.getUseRecord().getId();
+					if(useRecordConvertRecyclingApplicationNotMergeDeptCodeList.contains(recyclingApplication.getDepartCoding())){
+						//不合并申请单
+						return null;
 					}
 				}
 			}catch(Exception e){