Commit 7a9167ce authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10

parents 6fe2e875 89568836
......@@ -491,10 +491,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
for (TSalaryEmployee employee : updateEmployeeBankList) {
if (Common.isNotNull(employee.getBankProvince()) && !regNumber(employee.getBankProvince())) {
if (Common.isNotNull(employee.getBankProvince()) && regNumber(employee.getBankProvince())) {
areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankProvince().trim());
if (Common.isNotNull(areaProvince)) {
if (Common.isNotNull(employee.getBankCity()) && !regNumber(employee.getBankCity())) {
if (Common.isNotNull(employee.getBankCity()) && regNumber(employee.getBankCity())) {
areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + employee.getBankProvince().trim());
if (Common.isNotNull(areaCity)) {
......@@ -517,11 +517,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
private static boolean regNumber(String content) {
boolean flag = false;
boolean flag = true;
Pattern p = Pattern.compile("^[0-9]*$");
Matcher m = p.matcher(content);
if (m.matches()) {
flag = true;
flag = false;
}
return flag;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment