Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java =================================================================== diff -u -r12718 -r19910 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java (.../ImportSingleStorageController.java) (revision 12718) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java (.../ImportSingleStorageController.java) (revision 19910) @@ -81,6 +81,13 @@ errInfos.add(msg); } retMsgObj[0][2] = StringUtils.join(errInfos, "
"); + // 获取仓库 + List wareHouses = wareHouseManager.getWareHouseListByCurrentOrgUnit(); + if(wareHouses == null){ + wareHouses = new ArrayList(); + } + request.setAttribute("wareHouses", wareHouses); + request.setAttribute("actionUrl","/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.mhtml"); return new ModelAndView(redirectUrl, "msg", retMsgObj); }