Merge branches 'dev' and 'master' of ssh://10.10.100.21/source/smartschool-platform into dev

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

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -123,23 +120,34 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 	private Map<String,Object> getDetail(ClazzCurriculumDO cc,Long subjectId){
 		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
 		Map<String, Object> hashMap = new HashMap<>();
-		hashMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-		hashMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
+		Date curStartTime = cc.getCurStartTime();
+		if (ObjectUtils.isNotEmpty(curStartTime)){
+			hashMap.put("startTime",dateFormat.format(curStartTime));
+		}
+		Date curEndTime = cc.getCurEndTime();
+		if (ObjectUtils.isNotEmpty(curEndTime)){
+			hashMap.put("endTime",dateFormat.format(curEndTime));
+		}
+
 		SubjectDO subjectDO = subjectMapper.get(subjectId);
 		if (ObjectUtils.isNotEmpty(subjectDO)){
 			hashMap.put("subjectName",subjectDO.getSubjectName());
 		}
-		TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), subjectId);
-		if (ObjectUtils.isNotEmpty(teacher1)){
-			Long teacherId = teacher1.getTeacherId();
-			if (ObjectUtils.isNotEmpty(teacherId)){
-				TeacherDO teacherDO1 = wxTeacherMapper.get(teacherId);
-				if (ObjectUtils.isNotEmpty(teacherDO1)){
-					hashMap.put("teacherName",teacherDO1.getTeacherName());
-					hashMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
+		Long clazzId = cc.getClazzId();
+		if (ObjectUtils.isNotEmpty(clazzId)){
+			TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(clazzId, subjectId);
+			if (ObjectUtils.isNotEmpty(teacher1)){
+				Long teacherId = teacher1.getTeacherId();
+				if (ObjectUtils.isNotEmpty(teacherId)){
+					TeacherDO teacherDO1 = wxTeacherMapper.get(teacherId);
+					if (ObjectUtils.isNotEmpty(teacherDO1)){
+						hashMap.put("teacherName",teacherDO1.getTeacherName());
+						hashMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
+					}
 				}
 			}
 		}
+
 		return hashMap;
 	}
 }