From 53c38baf222e7c59de7d5fc1de1bce42709b9267 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Fri, 21 Jun 2024 15:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/dto/CourseQueryDto.java | 4 +++ .../service/impl/CourseServiceImpl.java | 29 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) 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 6f895735..0bca46f6 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 @@ -135,4 +135,8 @@ public class CourseQueryDto { * 任务课件id */ private List courseIds; + /** + * 项目id + */ + private Long projectId; } 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 4d8fa8c5..d5d4ad10 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 @@ -13,7 +13,11 @@ import java.util.stream.Stream; import javax.annotation.Resource; import javax.management.Query; +import com.xboe.api.ThirdApi; import com.xboe.core.orm.*; +import com.xboe.data.dto.UserData; +import com.xboe.school.study.dao.StudyCourseDao; +import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.hibernate.mapping.IdGenerator; import org.springframework.beans.factory.annotation.Autowired; @@ -109,6 +113,8 @@ public class CourseServiceImpl implements ICourseService { @Autowired(required = false) private IEventDataSender eventSender; + + /** * 生成过滤条件 @@ -256,6 +262,17 @@ public class CourseServiceImpl implements ICourseService { public PageList findPage(int pageIndex, int pageSize, CourseQueryDto dto) { List filters = createFilters(dto); List filters2 = createFilters(dto); + String sql = "SELECT\n" + + "\ts.id \n" + + "FROM\n" + + "\tboe.student s \n" + + "WHERE\n" + + "\ts.deleted = 0 \n" + + "\tAND s.type = 1 \n" + + "\tAND s.pid = ?1\n" + + "\tand s.student_id=?2 "; + List list = courseTeacherDao.sqlFindList(sql,dto.getProjectId(),dto.getOrgAid()); +// String aid=getCurrent().getAccountId(); //有权限的查询，也同时查询出创建人的数据，在权限上 if(TempFilterConfig.Manager_CourseFile_ByOrgIds) { if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) { @@ -268,16 +285,16 @@ public class CourseServiceImpl implements ICourseService { // filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); filters.add((FieldFilters.in("orgId",strings))); // filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); - if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ - filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); + if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){ + filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds()))); }else{ filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); } }else { // filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); filters.add(FieldFilters.eq("orgId",dto.getOrgIds())); - if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ - filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); + if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){ + filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds()))); }else{ filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); } @@ -287,8 +304,8 @@ public class CourseServiceImpl implements ICourseService { //log.info("【"+dto.getOrgAid()+"】 机构ids没有， 只查询自己创建的课程"); //没有机构权限，只能查出自己创建的 // filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); - if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ - filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); + if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){ + filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds()))); }else{ filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); }