Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r24118 -r24167 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 24118) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 24167) @@ -1,7 +1,6 @@ package com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service; import java.math.BigDecimal; -import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -3615,8 +3614,8 @@ JSONArray tousseInBasketArray = new JSONArray(); Map cMap=Maps.newHashMap(); int i = 0; - if(!CollectionUtils.isNotEmpty(tousseAllForReviewedBasket)){ - return null; + if(CollectionUtils.isEmpty(tousseAllForReviewedBasket)){ + return jsonArray; } //循环该记录下所有的包,加入到对应的篮筐内 for (TousseSimpleVO tousseSimpleVO : tousseAllForReviewedBasket) {