|
@@ -299,7 +299,7 @@ public class CompanyRelImportController extends BaseController
|
|
|
continue;
|
|
|
}
|
|
|
//社会统一代码正则校验
|
|
|
- String checkSocialCode = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$";
|
|
|
+ String checkSocialCode = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})||([1-9]\\d{15})$";
|
|
|
Pattern regeSocialCode = Pattern.compile(checkSocialCode);
|
|
|
Matcher matcherSocialCode = regeSocialCode.matcher(scySocialCode);
|
|
|
boolean isMatSocialCode = matcherSocialCode.matches();
|