MVP1.7.1 优化薪资提示语

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -115,6 +115,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				return this.salaryUploadCore(vo);
 			} catch (Exception e){
 				log.error("薪资导入异常：",e);
+				return R.failed("薪资导入异常，请检查表数据");
 			} finally {
 				importTwoAtomicInteger.decrementAndGet();
 			}
@@ -124,7 +125,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			log.error("超出阈值："+ ResultConstants.IMPORT_DOWN_LOAD_DATA);
 			return R.failed("薪资导入，" + ResultConstants.IMPORT_DOWN_LOAD_DATA);
 		}
-		return R.failed("薪资导入，" + ResultConstants.IMPORT_DOWN_LOAD_DATA);
+
 	}
 
 	private R<List<ErrorMessage>> salaryUploadCore(SalaryUploadParamVo vo) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java

@@ -804,6 +804,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 				return this.getExcelContent(file, excelVo);
 			} catch (Exception e){
 				log.error("薪资原表识别异常：",e);
+				return R.failed("薪资原表识别异常，请检查表数据");
 			} finally {
 				importAtomicInteger.decrementAndGet();
 			}
@@ -813,7 +814,6 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 			log.error("超出阈值："+ ResultConstants.IMPORT_DOWN_LOAD_DATA);
 			return R.failed("薪资原表识别，" + ResultConstants.IMPORT_DOWN_LOAD_DATA);
 		}
-		return R.failed("薪资原表识别中，" + ResultConstants.IMPORT_DOWN_LOAD_DATA);
 	}
 
 	/**