Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29897 -r29901 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29897) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29901) @@ -5081,8 +5081,9 @@ if (StringUtils.isNotBlank(departSearch)) { departFilterSql = " and i.settleaccountsdepart = '" + departSearch + "'"; - returnGoodsFilterSql += " and rr.departCoding = '" + invoicePlanDepartCoding - + "'"; + if(StringUtils.isNotBlank(invoicePlanDepartCoding)){ + returnGoodsFilterSql += " and rr.departCoding = '" + invoicePlanDepartCoding + "'"; + } returnGoodsDepartFilterSql = " and rr.depart = '" + departSearch + "'"; packingDisposableGoodsDepartSql = " and pr.orgUnitName = '" + departSearch + "'";