jiangjiazhi / regional-platform

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 14 additions and 2 deletions

...	...	@@ -127,7 +127,6 @@
127	127	*/
128	128	@RequestMapping(method = RequestMethod.GET, value = "/getCoureseById/{id}")
129	129	@ResponseBody
130		- @TokenRequired
131	130	public BaseResponse getCoureseById(@RequestParam(required = false) String id,
132	131	HttpServletRequest request) {
133	132

...	...	@@ -276,8 +276,21 @@
276	276	{
277	277	CourseModel model = courseModels.get(0);
278	278
	279	+
	280	+ CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
	281	+ courseTypeQuery.setYn(YnEnums.YES.getId());
	282	+ courseTypeQuery.setId(model.getCourseTypeId());
	283	+ List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery);
	284	+ if (CollectionUtils.isNotEmpty(typeModels))
	285	+ {
	286	+ String courseType = typeModels.get(0).getCourseTypeName();
	287	+ result.setCourseType(courseType);
	288	+ }
	289	+
	290	+ result.setCourseTypeId(model.getCourseTypeId());
	291	+
279	292	result.setId(model.getId());
280		- result.setCourseType(model.getCourseTypeId());
	293	+ result.setCourseTypeId(model.getCourseTypeId());
281	294	result.setCourseName(model.getCourseName());
282	295	result.setCourseSpeaker(model.getCourseSpeaker());
283	296	result.setCourseAddress(model.getCourseAddress());