Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r32539 -r32551 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 32539) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 32551) @@ -1072,8 +1072,8 @@ originalTousseList = objectDao.findByHql(hql); } - // 删除器械包(GDSZYY-82 修改外来器械申请单时支持删除单上的外来器械包) - if(CollectionUtils.isNotEmpty(originalTousseList)){ + // 删除器械包(GDSZYY-82 修改外来器械申请单时支持删除单上的外来器械包);"回收时修改",只会修改单个器械包,其它不修改的器械包不会传参,因此不能做删除操作 + if(CollectionUtils.isNotEmpty(originalTousseList) && !ForeignTousseApplication.ACTION_TYPE_RECYCLEUPDATE.equals(actionType)){ List deleteTdList = new ArrayList(); for (TousseDefinition td : originalTousseList) { Long id = td.getId();