优化组织架构的判定

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxUserServiceImpl.java

@@ -222,22 +222,26 @@ public class WxUserServiceImpl implements WxUserService {
 				ClazzDO clazzDO = clazzMapper.get(tc.getClazzId());
 				if (ObjectUtils.isNotEmpty(clazzDO)){
 					Map<String, Object> clazzMap = JavaBeanUtil.object2Map(clazzDO);
-					clazzMap.put("gradeName",gradeMapper.get(clazzDO.getGradeId()).getGradeName());
-					Map<String, Object> map = new HashMap<>();
-					map.put("clazzId",clazzDO.getClazzId());
-					List<StudentDO> studentDOS = studentMapper.list(map);
-					List<TeacherClazzDO> list = teacherClazzMapper.list(map);
-					if (ObjectUtils.isNotEmpty(studentDOS)){
-						List<TeacherDO> teacherDOS = new ArrayList<>();
-						for (TeacherClazzDO teacherClazzDO:list) {
-							TeacherDO teacherDO = teacherMapper.get(teacherClazzDO.getTeacherId());
-							teacherDO.setUserPhone(userMapper.get(teacherDO.getUserId()).getUserPhone());
-							teacherDOS.add(teacherDO);
+					GradeDO gradeDO = gradeMapper.get(clazzDO.getGradeId());
+					if (ObjectUtils.isNotEmpty(gradeDO)){
+						clazzMap.put("gradeName",gradeDO.getGradeName());
+						Map<String, Object> map = new HashMap<>();
+						map.put("clazzId",clazzDO.getClazzId());
+						List<StudentDO> studentDOS = studentMapper.list(map);
+						List<TeacherClazzDO> list = teacherClazzMapper.list(map);
+						if (ObjectUtils.isNotEmpty(studentDOS)){
+							List<TeacherDO> teacherDOS = new ArrayList<>();
+							for (TeacherClazzDO teacherClazzDO:list) {
+								TeacherDO teacherDO = teacherMapper.get(teacherClazzDO.getTeacherId());
+								teacherDO.setUserPhone(userMapper.get(teacherDO.getUserId()).getUserPhone());
+								teacherDOS.add(teacherDO);
+							}
+							clazzMap.put("studentDOS",removeDuplicate(studentDOS));
+							clazzMap.put("teacherDOS",removeDuplicate(teacherDOS));
+							maps.add(clazzMap);
 						}
-						clazzMap.put("studentDOS",removeDuplicate(studentDOS));
-						clazzMap.put("teacherDOS",removeDuplicate(teacherDOS));
-						maps.add(clazzMap);
 					}
+
 				}
 
 			}