Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java =================================================================== diff -u -r28937 -r28938 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 28937) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 28938) @@ -809,7 +809,7 @@ } private void addApplicationGoodsVoStatus( - Collection list, String orgUnitCoding) { + Collection list, String departCoding) { if(CollectionUtils.isNotEmpty(list)){ List tousseNameList = list.stream().filter(vo -> { return !StringUtils.equals(DisposableGoods.TYPE_NAME, vo.getGoodsType()); @@ -823,13 +823,13 @@ + "where ti.orgUnitCoding='%s' and %s " + "and ti.status in ('%s','%s') " + "and ( td.limitInvoiceDepart is null or td.limitInvoiceDepart <> '%s' " - + "or (td.limitInvoiceDepart = '%s' and (ti.departCoding is null or ti.departCoding = '%s'))) " + + "or (td.limitInvoiceDepart = '%s' and (ti.departCoding is null or ti.departCoding = '' or ti.departCoding = '%s'))) " + "group by ti.tousseName having count(0) > 0", TousseInstance.class.getSimpleName(),TousseDefinition.class.getSimpleName(),AcegiHelper.getCurrentOrgUnitCode(), SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.tousseName", tousseNameList), TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED, Constants.STR_YES, Constants.STR_YES, - orgUnitCoding == null ? "" : orgUnitCoding + departCoding == null ? "" : departCoding ); try { rs = objectDao.executeSql(querySql);