update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupTrainPlanSaveDto.java

@@ -6,7 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.util.List;
 
-public class MusicGroupTrainPlanSaveDto {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class MusicGroupTrainPlanSaveDto extends BaseEntity {
 	@ApiModelProperty(value = "年份",required = false)
 	private String year;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireTopicServiceImpl.java

@@ -125,6 +125,10 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 	@Override
 	public QuestionnaireTopic getDetail(Integer topicId) {
 		QuestionnaireTopic questionnaireTopic = questionnaireTopicDao.get(topicId);
+		
+		if(questionnaireTopic == null){
+			throw new BizException("问卷[{}]模板查询失败", topicId);
+		}
 		Map<String,Object> paramMap = new HashMap(1);
 		paramMap.put("topicId",topicId);
 		questionnaireTopic.setQuestionnaireQuestionList(questionnaireQuestionDao.findAll(paramMap));