Browse Source

作业通知异常

koul 6 years ago
parent
commit
1aa8728183

+ 23 - 8
applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxTaskNotifyServiceImpl.java

@@ -220,19 +220,34 @@ public class WxTaskNotifyServiceImpl implements WxTaskNotifyService {
 
     private Map<String, Object> taskDetail(TaskNotifyDO taskNotifyDO) {
         Map<String, Object> map1 = JavaBeanUtil.object2Map(taskNotifyDO);
-        TeacherDO teacherDO = teacherMapper.get(taskNotifyDO.getTaskCreator());
-        map1.put("teacherName", teacherDO.getTeacherName());
-        map1.put("teacherPhoto", teacherDO.getTeacherPhoto());
+        Long taskCreator = taskNotifyDO.getTaskCreator();
+        if (ObjectUtils.isNotEmpty(taskCreator)){
+            TeacherDO teacherDO = teacherMapper.get(taskCreator);
+            if (ObjectUtils.isNotEmpty(teacherDO)){
+                map1.put("teacherName", teacherDO.getTeacherName());
+                map1.put("teacherPhoto", teacherDO.getTeacherPhoto());
+            }
+        }
         List<TaskReplyDO> taskReplyDOS = taskReplyMapper.listByTaskId(taskNotifyDO.getTaskId());
         List<Map<String, Object>> maps = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(taskReplyDOS)) {
             for (TaskReplyDO tr : taskReplyDOS) {
                 Map<String, Object> map = JavaBeanUtil.object2Map(tr);
-                ParentsDO parentsDO = parentsMapper.get(tr.getParentId());
-                map.put("parentsName", parentsDO.getParentsName());
-                map.put("parentsPhoto", parentsDO.getParentsPhoto());
-                StudentDO studentDO = studentMapper.get(tr.getStuId());
-                map.put("stuName", studentDO.getStuName());
+                Long parentId = tr.getParentId();
+                if (ObjectUtils.isNotEmpty(parentId)){
+                    ParentsDO parentsDO = parentsMapper.get(parentId);
+                    if (ObjectUtils.isNotEmpty(parentsDO)){
+                        map.put("parentsName", parentsDO.getParentsName());
+                        map.put("parentsPhoto", parentsDO.getParentsPhoto());
+                    }
+                }
+                Long stuId = tr.getStuId();
+                if (ObjectUtils.isNotEmpty(stuId)){
+                    StudentDO studentDO = studentMapper.get(stuId);
+                    if (ObjectUtils.isNotEmpty(studentDO)){
+                        map.put("stuName", studentDO.getStuName());
+                    }
+                }
                 maps.add(map);
             }
         }