|
@@ -1218,7 +1218,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
InputStream inputStream = (InputStream) map.get("inputStream");
|
|
|
List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(SysUserImportDto.class, DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
|
|
|
List<ExcelError> excelErrorTemp = new ArrayList<>();
|
|
|
- Map<String, String> checkName = new HashMap<>();
|
|
|
+// Map<String, String> checkName = new HashMap<>();
|
|
|
Map<String, String> checkCode = new HashMap<>();
|
|
|
Map<String, String> checkPhoneMap = new HashMap<>();
|
|
|
for (int i = 0; i < finalExcelList.size(); i++) {
|
|
@@ -1237,11 +1237,11 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
String roleName = sysUserImportDto.getRoleName();
|
|
|
|
|
|
// 检验excel中
|
|
|
- if (checkName.containsKey(name)) {
|
|
|
- throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【姓名】:" + name);
|
|
|
- } else {
|
|
|
- checkName.put(name, code);
|
|
|
- }
|
|
|
+// if (checkName.containsKey(name)) {
|
|
|
+// throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【姓名】:" + name);
|
|
|
+// } else {
|
|
|
+// checkName.put(name, code);
|
|
|
+// }
|
|
|
if (checkCode.containsKey(code)) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【工号】:" + code);
|
|
|
} else {
|