提交修改

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -392,13 +392,15 @@ public class CourseManageApi extends ApiBaseController{
 		if(dto.getAuditUser()==null) {
 			return badRequest("HRBP审核信息错误");
 		}
-		
-		if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
-			return badRequest("HRBP审核信息人员错误");
-		}
-		
-		if(StringUtils.isBlank(dto.getAuditUser().getCode())) {
-			return badRequest("HRBP审核信息人员错误");
+		//此判断用于本地测试
+		if(!isLocalDevelopment()) { 
+			if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
+				return badRequest("HRBP审核信息人员错误");
+			}
+			
+			if(StringUtils.isBlank(dto.getAuditUser().getCode())) {
+				return badRequest("HRBP审核信息人员错误");
+			}
 		}
 		
 //		//检查资源内容的完整性，内容需要在前端检查 ，修改，提交必须是在编辑区域才有的操作

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -322,7 +322,7 @@ public class CourseServiceImpl implements ICourseService {
 	}
 
 	@Override
-	public List<Course> findSimpleList(int pageIndex,String currentAid, CourseQueryDto dto) {
+	public List<Course> findSimpleList(int number,String currentAid, CourseQueryDto dto) {
 		List<IFieldFilter> filters = createFilters(dto);
 		//自动添加过滤已删除
 		filters.add(FieldFilters.eq("deleted",false));

servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java

@@ -260,8 +260,38 @@ public class PortalIndexApi extends ApiBaseController{
 		}
 	}
 
+	/**
+	 * 课程关联的推荐
+	 * @param pager
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("/course-for-recommend")
+	public JsonResponse<List<Course>> courseRecommend(Course course){
+		String aid = this.getCurrent().getAccountId();
+		CourseQueryDto dto=new CourseQueryDto();
+		dto.setPublish(true);
+		dto.setYearFilter(true);
+		//还应该根据课程的规则查询
+		List<Course> list = courseService.findSimpleList(6, aid,dto);
+		//提取教师信息
+		List<String> ids=new ArrayList<String>();
 
 
-
+		for(Course c :list) {
+			ids.add(c.getId());
+		}
+		List<CourseTeacher> teachers = courseService.findTeachersByCourseIds(ids);
+		//注意对于多个教师的情况，这里只是设置第一个教师
+		for(Course c :list) {
+			for(CourseTeacher ct : teachers) {
+				if(ct.getCourseId().equals(c.getId())) {
+					c.setTeacherId(ct.getTeacherId());
+					c.setTeacher(ct.getTeacherName());
+				}
+			}
+		}
+		return success(list);
+	}
 
 }