教师导入报错解决

src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -687,15 +687,23 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
                 BaseTeacher teacher = teacherMap.get(user.getId());
                 teacher.setEmployType(dictionaryMap.get(rowData.get(6).toString()));
-                teacher.setJobState(dictionaryMap.get(rowData.get(9).toString()));
-                teacher.setJoinTime(sdf.parse(rowData.get(10).toString()));
+                if(rowData.get(9) != null && StrUtil.isNotEmpty(rowData.get(9).toString())){
+                    teacher.setJobState(dictionaryMap.get(rowData.get(9).toString()));
+                }
+                if(rowData.get(10) != null && StrUtil.isNotEmpty(rowData.get(10).toString())){
+                    teacher.setJoinTime(sdf.parse(rowData.get(10).toString()));
+                }
+
                 updateTeacherList.add(teacher);
 
-                BaseTeacherRegular teacherRegular = regularMap.get(user.getId());
-                JSONArray teachingStatus = teacherRegular.getTeachingStatus();
-                teachingStatus.add(dictionaryMap.get(rowData.get(11).toString()));
-                teacherRegular.setTeachingStatus(teachingStatus);
-                updateBaseTeacherRegularList.add(teacherRegular);
+                if(rowData.get(11) != null && StrUtil.isNotEmpty(rowData.get(11).toString())){
+                    BaseTeacherRegular teacherRegular = regularMap.get(user.getId());
+                    JSONArray teachingStatus = teacherRegular.getTeachingStatus();
+                    teachingStatus.add(dictionaryMap.get(rowData.get(11).toString()));
+                    teacherRegular.setTeachingStatus(teachingStatus);
+                    updateBaseTeacherRegularList.add(teacherRegular);
+                }
+
 
                 List<Long> deptIds = userDeptMap.get(user.getId());
                 if (deptIds == null || !deptIds.contains(departmentMap.get(rowData.get(7).toString()))) {
@@ -731,20 +739,28 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
             teacher.setEmployType(dictionaryMap.get(rowData.get(6).toString()));
             teacher.setUserId(user.getId());
             teacher.setCreateDate(LocalDateTime.now());
-            teacher.setJobState(dictionaryMap.get(rowData.get(9).toString()));
-            teacher.setJoinTime(sdf.parse(rowData.get(10).toString()));
+            if(rowData.get(9) != null && StrUtil.isNotEmpty(rowData.get(9).toString())){
+                teacher.setJobState(dictionaryMap.get(rowData.get(9).toString()));
+            }
+
+            if(rowData.get(10) != null && StrUtil.isNotEmpty(rowData.get(10).toString())){
+                teacher.setJoinTime(sdf.parse(rowData.get(10).toString()));
+            }
+
             teacherMapper.insert(teacher);
 
-            BaseTeacherRegular teacherRegular = new BaseTeacherRegular();
-            JSONArray teachingStatus = new JSONArray();
-            teachingStatus.add(dictionaryMap.get(rowData.get(11).toString()));
-            teacherRegular.setTeachingStatus(teachingStatus);
-            teacherRegular.setCreateDate(LocalDateTime.now());
-            teacherRegular.setCreateUserId(StpUtil.getLoginIdAsLong());
-            teacherRegular.setUserId(user.getId());
-            teacherRegular.setDeleteMark(DeleteMark.NODELETE.getCode());
-            teacherRegular.setEnabledMark(EnabledMark.ENABLED.getCode());
-            teacherRegularMapper.insert(teacherRegular);
+            if(rowData.get(11) != null && StrUtil.isNotEmpty(rowData.get(11).toString())){
+                BaseTeacherRegular teacherRegular = new BaseTeacherRegular();
+                JSONArray teachingStatus = new JSONArray();
+                teachingStatus.add(dictionaryMap.get(rowData.get(11).toString()));
+                teacherRegular.setTeachingStatus(teachingStatus);
+                teacherRegular.setCreateDate(LocalDateTime.now());
+                teacherRegular.setCreateUserId(StpUtil.getLoginIdAsLong());
+                teacherRegular.setUserId(user.getId());
+                teacherRegular.setDeleteMark(DeleteMark.NODELETE.getCode());
+                teacherRegular.setEnabledMark(EnabledMark.ENABLED.getCode());
+                teacherRegularMapper.insert(teacherRegular);
+            }
 
             UserDeptRelation userDeptRelation = new UserDeptRelation();
             userDeptRelation.setDeptId(departmentMap.get(rowData.get(7).toString()));