Merge branch 'cloud' into xingao_0921

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

@@ -128,8 +128,13 @@ public class CourseFileApi extends ApiBaseController {
         
         //默认是查询自己的课件。
         //
+        try {
 	        PageList<CourseFile> courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters);
 	        return success(courseFilePageList);
+        }catch(Exception e) {
+        	log.error("查询课件错误",e);
+        	return error("查询失败",e.getMessage());
+        }
     }
 
     /**
@@ -218,6 +223,10 @@ public class CourseFileApi extends ApiBaseController {
             return badRequest("无文件信息");
         }
         
+        if(StringUtils.isBlank(file.getOrgId())) {
+        	return badRequest("请先选择资源归属");
+        }
+
         // 重设文件类型为小写
         file.setFileType(file.getFileType().toLowerCase());
 

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

@@ -106,12 +106,12 @@ public class CourseManageApi extends ApiBaseController{
     IDataUserSyncService userSyncService;
 	
 	
-	@PostMapping("/test")
+//	@PostMapping("/test")
-	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
+//	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
-		//dto.setOrgAid("7003708665807110150");
+//		//dto.setOrgAid("7003708665807110150");
-		PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
+//		PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
-		return success(coursePageList);
+//		return success(coursePageList);
-	}
+//	}
 	
 	/**
 	 * 管理列表的查询

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java

@@ -31,6 +31,11 @@ public class CourseQueryDto {
     /**是否发布，无就是全部*/
     private Boolean publish;
     
+    /**
+     * 是否启用
+     */
+    private Boolean enabled;
+    
     /**创建人*/
     private String createUser;
     

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

@@ -72,6 +72,8 @@ public class CourseFileServiceImpl implements ICourseFileService {
 	public void updateList(List<CourseFile> cflist) {
 		for(CourseFile  cf : cflist) {
             courseFileDao.updateMultiFieldById(cf.getId(), UpdateBuilder.create("name",cf.getName()),
+                    UpdateBuilder.create("orgId",cf.getOrgId()),
+                    UpdateBuilder.create("orgName",cf.getOrgName()),
                     UpdateBuilder.create("resOwner1",cf.getResOwner1()),
                     UpdateBuilder.create("resOwner2",cf.getResOwner2()),
                     UpdateBuilder.create("resOwner3",cf.getResOwner3()),

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

@@ -216,7 +216,10 @@ public class CourseServiceImpl implements ICourseService {
         if(dto.getPublish()!=null){
         	filters.add(FieldFilters.eq("published",dto.getPublish()));
         }
-        
+        //是否启用
+        if(dto.getEnabled()!=null){
+        	filters.add(FieldFilters.eq("enabled",dto.getEnabled()));
+        }
         return filters;
     }
 

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java

@@ -114,6 +114,9 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 			if(StringUtils.isNotBlank(sc.getCourseName())) {
 				query.addFilter(FieldFilters.like("courseName", sc.getCourseName()));
 			}
+			if(StringUtils.isNotBlank(sc.getAname())) {
+				query.addFilter(FieldFilters.eq("aname", sc.getAname()));
+			}
 			if(sc.getStatus()!=null) {
 				query.addFilter(FieldFilters.eq("status", sc.getStatus()));
 			}