MVP1.4-导出-薪资人员导入

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

@@ -553,7 +553,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		}
 		TSalaryEmployee emp;
 		// 开户行省市的区域暂存
-		String areaStr;
+		String areaProvince;
+		String areaCity;
 		boolean curTaxMonth;
 		TSalaryEmployee excel;
 		// 是否可更新
@@ -581,14 +582,14 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 								emp.setBankSubName(excel.getBankSubName());
 							}
 							if (Common.isNotNull(excel.getBankProvince())) {
-								areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankProvince().trim());
-								if (Common.isNotNull(areaStr)) {
-									emp.setBankProvince(areaStr);
+								areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankProvince().trim());
+								if (Common.isNotNull(areaProvince)) {
+									emp.setBankProvince(areaProvince);
 									if (Common.isNotNull(excel.getBankCity())) {
-										areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankCity().trim()
+										areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankCity().trim()
 												+ CommonConstants.DOWN_LINE_STRING + excel.getBankProvince().trim());
-										if (Common.isNotNull(areaStr)) {
-											emp.setBankCity(areaStr);
+										if (Common.isNotNull(areaCity)) {
+											emp.setBankCity(areaCity);
 										} else {
 											errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CITY_ERROR));
 											continue;
@@ -629,13 +630,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 							if (pre != null) {
 								errorMessageList.add(new ErrorMessage((i + 2), "新增员工，除了支行，其他必填"));
 							} else {
-								areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankProvince().trim());
-								if (Common.isNotNull(areaStr)) {
-									excel.setBankProvince(areaStr);
-									areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankCity().trim()
+								areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankProvince().trim());
+								if (Common.isNotNull(areaProvince)) {
+									areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankCity().trim()
 											+ CommonConstants.DOWN_LINE_STRING + excel.getBankProvince().trim());
-									if (Common.isNotNull(areaStr)) {
-										excel.setBankCity(areaStr);
+									excel.setBankProvince(areaProvince);
+									if (Common.isNotNull(areaCity)) {
+										excel.setBankCity(areaCity);
 									} else {
 										errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CITY_ERROR));
 										continue;