|
@@ -1531,11 +1531,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
checkDtoMap.put(code, sysUserImportDto);
|
|
|
}
|
|
|
|
|
|
- if (Objects.isNull(code) || code.length() > 30 || !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
|
|
|
- errorStringJoiner.add("[工号]不符合规范,最长30个字符");
|
|
|
- }
|
|
|
- if (Objects.isNull(name) || name.length() > 30) {
|
|
|
- errorStringJoiner.add("[姓名]不符合输入规范,最长30个字符");
|
|
|
+ if (Objects.nonNull(code) && !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
|
|
|
+ errorStringJoiner.add("[工号]不符合规范");
|
|
|
}
|
|
|
if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
|
|
|
errorStringJoiner.add("[手机号]不符合输入规范");
|
|
@@ -1591,9 +1588,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
}
|
|
|
|
|
|
excelErrorTemp.addAll(ExcelUtil.checkExcelField(basicClazzImportDto, y, i));
|
|
|
- if (Objects.isNull(clazzName) || clazzName.length() > 50) {
|
|
|
- excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[学号]不符合输入规范"));
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
if (excelErrorTemp.size() > 0) {
|