Merge branch 'master' of http://git.yaozhitech.com/yinli/yangguang

src/main/java/com/ylcm/sys/controller/AdTheatreController.java

@@ -188,6 +188,11 @@ public class AdTheatreController extends BaseController{
 			BaseExcelListener<AdTheatreExcelDTO> listener = new BaseExcelListener<>();
 			EasyExcel.read(excelfile.getInputStream(), AdTheatreExcelDTO.class,listener).sheet(1).doRead();
 			List<AdTheatreExcelDTO> dtos = listener.getDataList();
+			if(CollectionUtils.isEmpty(dtos)) {
+				request.setAttribute("code", Constants.CODE_FAIL);
+				request.setAttribute("msg", "表格数据为空！");
+				return "common/import_callback";
+			}
 			// 表格实际从第二行开始导入
 			int index = 2;
 			// 待入库