Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r15631 -r15635 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 15631) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 15635) @@ -1295,12 +1295,14 @@ //用对比后没有打印的部门编号去invoicePlan那里查询今天已经打印过的部门编号 List isPrintedByDeptCodes = invoicePlanManager.findTodayIsPrintedByDeptCodes(noPrintListCodes); List showNoPrintListCodes = new ArrayList<>(); - //用没有打印的部门编号和今天已经打印的部门编号对比,如果noPrintListCodes的部门编号不在isPrintedByDeptCodes里,则需要在页面提示用户 - for (String noPrintListCode : noPrintListCodes) { - if (!isPrintedByDeptCodes.contains(noPrintListCode)){ - showNoPrintListCodes.add(noPrintListCode); - } - } + if (CollectionUtils.isNotEmpty(isPrintedByDeptCodes)){ + //用没有打印的部门编号和今天已经打印的部门编号对比,如果noPrintListCodes的部门编号不在isPrintedByDeptCodes里,则需要在页面提示用户 + for (String noPrintListCode : noPrintListCodes) { + if (!isPrintedByDeptCodes.contains(noPrintListCode)){ + showNoPrintListCodes.add(noPrintListCode); + } + } + } return orgUnitManager.findDeptNameByOrgUnitCodes(showNoPrintListCodes); } catch (Exception e) { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15631 -r15635 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15631) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15635) @@ -4484,8 +4484,7 @@ noPrintList.add(code); } } - return noPrintList; } - return null; + return noPrintList; } }