Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java =================================================================== diff -u -r32164 -r32167 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 32164) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 32167) @@ -1036,11 +1036,11 @@ @Override public JSONArray getTousseGoodsStockAlarmWarning(String orgUnitCode) { + JSONArray message = new JSONArray(); List goodsStockVoList = getWarningGoodsStockVo(orgUnitCode); if(CollectionUtils.isEmpty(goodsStockVoList)){ - return null; + return message; } - JSONArray message = new JSONArray(); for (GoodsStockVo goodsStockVo : goodsStockVoList) { //xx科室xx物品库存为xx,低于(等于)最小库存xx,请提前做好备货! String orgUnitName = goodsStockVo.getOrgUnitName();