Merge branch 'oa_2022-03-29' of http://git.dayaedu.com/yonge/mec into master_saas

mec-web/src/main/java/com/ym/mec/web/controller/ImportController.java

@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.UploadReturnBean;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.Api;
@@ -100,6 +101,9 @@ public class ImportController extends BaseController {
             file.transferTo(excelFile);
             //如果是乐团退费，校验excel
             if(processId != null && processId.equals(19)){
+                if(!"xls".equals(prefix.substring(1)) && !"xlsx".equals(prefix.substring(1))){
+                    throw new BizException("请上传Excel文件");
+                }
                 financialExpenditureService.checkOaQuitMusicGroupExcel(FileUtils.readFileToByteArray(excelFile),filename);
             }
             UploadReturnBean bean = uploadFileService.uploadFile(FileUtils.openInputStream(excelFile), UploadUtil.getExtension(filename));