diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java index 4f038592..ad99fc9a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java @@ -8,12 +8,14 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.xboe.common.utils.StringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.web.bind.annotation.GetMapping; @@ -135,6 +137,15 @@ public class CourseFileApi extends ApiBaseController { if (cfile.getResType() != null) { filters.add(FieldFilters.eq("resType", cfile.getResType())); } + if(StringUtil.isNotBlank(cfile.getOrgId())){ + if(cfile.getOrgId().contains(",")){ + String[] split = cfile.getOrgId().split(","); + List strings = Arrays.asList(split); + filters.add(FieldFilters.in("orgId",strings)); + }else { + filters.add(FieldFilters.eq("orgId",cfile.getOrgId())); + } + } //默认是查询自己的课件。 if (self == null) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java index d138e4ce..7c75fe41 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java @@ -96,4 +96,9 @@ public class CourseQueryDto { * 是否公开课,0表非公开课,1表公开课 */ private Integer openCourse; + + /** + * 表资源归属的in查询 + * */ + private String orgId; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 61062f10..8cd85d4a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -202,6 +203,15 @@ public class CourseServiceImpl implements ICourseService { if(dto.getPublish()!=null){ filters.add(FieldFilters.eq("published",dto.getPublish())); } + if(StringUtil.isNotBlank(dto.getOrgId())){ + if(dto.getOrgId().contains(",")){ + String[] split = dto.getOrgId().split(","); + List strings = Arrays.asList(split); + filters.add(FieldFilters.in("orgId",strings)); + }else { + filters.add(FieldFilters.eq("orgId",dto.getOrgId())); + } + } return filters; }