Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r29896 -r29999 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 29896) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 29999) @@ -1145,7 +1145,7 @@ && StringUtils.isNotBlank(supplierName)) { String sql = String .format("where po.departCoding = '%s' and po.tousseName = '%s' and " - + "po.supplierName = '%s' and po.returnTime is null and po.returnMan is null " + + "po.supplierName = '%s' and po.returnTime is null and (po.returnMan is null or po.returnMan = '') " + "and po.committedStatus = 1 and po.endStatus is null", departCoding, tousseName, supplierName); int count = objectDao.countObjectBySql(ForeignTousseApplication.class.getSimpleName(), sql);