Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java =================================================================== diff -u -r29715 -r29719 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 29715) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 29719) @@ -58,10 +58,16 @@ if(array != null){ String invoiceplanId = params.optString("app_id"); InvoicePlan plan = get(invoiceplanId); - boolean isContinue = params.optBoolean("isContinue", false); + String isContinueStr = params.optString("isContinue");//是否要归还 + Boolean isContinue = null;//为空做验证 + if("true".equals(isContinueStr)){ + isContinue = true;//归还 + }else if("false".equals(isContinueStr)){ + isContinue = false;//不归还 + } Map restApplyTousses = null; Map tousseDefIdPrepareRecycleAmountMap = null; - if(!isContinue){//配置预回收后发货,要做归还提醒 + if(isContinue == null){//配置预回收后发货,要做归还提醒 SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); if(config != null && SupplyRoomConfig.TOUSSEDELIVEROCCASION_AFTERPRERECYCLING.equals(config.getTousseDeliverOccasion())){ String tousseNames = getTousseNames(array); @@ -70,7 +76,7 @@ throw new BorrowUnRecturnException(msg); } } - }else{ + }else if(isContinue){ restApplyTousses = new HashMap<>(); tousseDefIdPrepareRecycleAmountMap = new HashMap(); }