diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 10e97d040..d9e3d079a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2636,25 +2636,26 @@ public class EmisBaseService { // 财务已确认账单不允许修改 List emisSettleSubBillList=getSettleSubBillListByBillCode(emisWaybill.getBillCode()); - if(emisSettleSubBillList!=null ){ + if(!CollectionUtils.isEmpty(emisSettleSubBillList) ){ if(emisSettleSubBillList.size()>1) { // 已分单不允许修改 return true; - } + }else { - EmisSettleSubBill emisSettleSubBill= emisSettleSubBillList.get(0); - if("1".equals(emisSettleSubBill.getBlConfirmCenter()) ){ - // 财务确认出账明细锁账 - return true; - } + EmisSettleSubBill emisSettleSubBill = emisSettleSubBillList.get(0); + if ("1".equals(emisSettleSubBill.getBlConfirmCenter())) { + // 财务确认出账明细锁账 + return true; + } - // 财务或业务确认不出账不允许修改 - if("2".equals(emisSettleSubBill.getBlConfirmCenter()) - || "2".equals(emisSettleSubBill.getBlConfirmSite()) - ){ - // 财务确认出账明细锁账 - return true; + // 财务或业务确认不出账不允许修改 + if ("2".equals(emisSettleSubBill.getBlConfirmCenter()) + || "2".equals(emisSettleSubBill.getBlConfirmSite()) + ) { + // 财务确认出账明细锁账 + return true; + } } }