Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r27581 -r27582 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 27581) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 27582) @@ -2560,8 +2560,16 @@ tousseInstanceManager.save(tousseInstance); } //联动需改装配记录的审核人 + Set idsWithoutReviewer = new HashSet(); + List packRecords = objectDao.findByIds(PackingRecord.class.getSimpleName(), new ArrayList(idsForUpdateReviewer)); + for (PackingRecord packingRecord : packRecords) { + //审核每一个消毒包时,需要检查这个包所关联的装配记录的审核人是否为空,如果为空,则需要进行赋值;如果不为空,不进行赋值。 + if(StringUtils.isBlank(packingRecord.getReviewer()) || StringUtils.isNotBlank(reviewerName)){ + idsWithoutReviewer.add(packingRecord.getId()); + } + } updateReviewersOfPackingRecordByTousseInstanceIds( - StringUtils.isBlank(reviewerName) ? loginUser.getUserFullName() : reviewerName, idsForUpdateReviewer); + StringUtils.isBlank(reviewerName) ? loginUser.getUserFullName() : reviewerName, idsWithoutReviewer); if(reviewedBasket != null){ ResultSet rs = null; //查出该篮筐实例中所有包实例的所有的灭菌方式(去除重复值后)、因为一个篮筐也有可能同时有多人用来做审核、同时前端页面也没有刷新