MVP1.7.0 导入

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -2619,7 +2619,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			// 薪资服务的开户行
 			R<TBankNameMapVo> bankRes = HttpDaprUtil.invokeMethodPost(salaryProperties.getAppUrl()
 					, salaryProperties.getAppId(), "/tbankset/inner/getBankMap", null, TBankNameMapVo.class, SecurityConstants.FROM_IN);
-			Map<String, String> bankMap = new HashMap<>();
+			Map<String, String> bankMap;
 			if (Common.isEmpty(bankRes) || bankRes.getData() == null || bankRes.getData().getBankMap() == null){
 				return R.failed("获取薪资服务开户行信息失败！");
 			} else {
@@ -2964,7 +2964,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 					errorList.add(info);
 				}
 			}
-			// boolean flag = false;
 			// 验证通过的，开始保存
 			if (!saveList.isEmpty()) {
 				List<String> preList = baseMapper.getTPreEmpMainListByCardAndDept(idCardList, deptId);
@@ -3335,13 +3334,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 				}
 			}
 			if (!errorList.isEmpty()) {
-				return new R<>(CommonConstants.TWO_INT, "失败数据：", excelList);
+				return new R<>(CommonConstants.TWO_INT, "失败数据：", errorList);
 			} else {
 				//数据保存
-				return R.ok(excelList);
+				return R.ok();
 			}
 		} else {
-			return R.failed("未识别导表格内容行！请检查表格！");
+			return R.failed("未识别到表格内容行！请检查表格！");
 		}
 	}