Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r26515 -r26563 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 26515) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 26563) @@ -3581,7 +3581,7 @@ condition += String.format(" and po.type = '%s' and po.processStatus = '%s' and (po.endStatus <> '%s' or po.endStatus is null) ", InvoicePlan.TYPE_EXPENSIVEGOODS_FORM,InvoicePlan.PROCESSSTATUS_BE_THROUGH_WITH,InvoicePlan.STATUS_END); } - condition += " and po.id in (select egi.invoicePlanId from "+ ExpensiveGoodsInstance.class.getSimpleName() +" egi where egi.expensiveGoodsBill is null and egi.useRecord is null)"; + condition += " and po.id not in (select egi.invoicePlanId from "+ ExpensiveGoodsInstance.class.getSimpleName() +" egi where egi.expensiveGoodsBill is not null or egi.useRecord is not null)"; String orderSql = " order by applicationTime desc"; List invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(),condition + orderSql); List> list = new ArrayList>();