getBankCity

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -378,10 +378,22 @@ public class SalaryAccountUtil implements Serializable {
 											continue;
 										} else {
 											areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankProvince().trim());
-											newEmp.setBankProvince(Integer.parseInt(areaStr));
+											if (Common.isNotNull(areaStr)) {
+												newEmp.setBankProvince(Integer.parseInt(areaStr));
+											} else {
+												error = "第" + (i + 2) + "行：新员工-开户行省错误："+ entity.getBankProvince();
+												errorList.add(new ErrorMessage((i + 2), error));
+												continue;
+											}
 											areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim() 
 													+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
-											newEmp.setBankCity(Integer.parseInt(areaStr));
+											if (Common.isNotNull(areaStr)) {
+												newEmp.setBankCity(Integer.parseInt(areaStr));
+											} else {
+												error = "第" + (i + 2) + "行：新员工-开户行市错误："+ entity.getBankCity();
+												errorList.add(new ErrorMessage((i + 2), error));
+												continue;
+											}
 										}
 										if (Common.isEmpty(entity.getBankNo())) {
 											error = "第" + (i + 2) + "行：新员工-银行卡号-不可为空！";
@@ -405,11 +417,15 @@ public class SalaryAccountUtil implements Serializable {
 										}
 										if (Common.isNotNull(entity.getBankProvince())) {
 											areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankProvince().trim());
-											newEmp.setBankProvince(Integer.parseInt(areaStr));
+											if (Common.isNotNull(areaStr)) {
+												newEmp.setBankProvince(Integer.parseInt(areaStr));
+											}
 											if (Common.isNotNull(entity.getBankCity())) {
 												areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim()
 														+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
-												newEmp.setBankCity(Integer.parseInt(areaStr));
+												if (Common.isNotNull(areaStr)) {
+													newEmp.setBankCity(Integer.parseInt(areaStr));
+												}
 											}
 										}
 									}