hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复查询失败bug

Browse Source
This commit is contained in:
xiaozhequ
2024-06-21 15:46:43 +08:00
parent de69ba1c11
commit 53c38baf22
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,4 +135,8 @@ public class CourseQueryDto {
* 任务课件id * 任务课件id
*/ */
private List<String> courseIds; private List<String> courseIds;
/**
* 项目id
*/
private Long projectId;
} }

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

@@ -13,7 +13,11 @@ import java.util.stream.Stream;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.management.Query; import javax.management.Query;
import com.xboe.api.ThirdApi;
import com.xboe.core.orm.*; 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.apache.commons.lang3.StringUtils;
import org.hibernate.mapping.IdGenerator; import org.hibernate.mapping.IdGenerator;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +114,8 @@ public class CourseServiceImpl implements ICourseService {
@Autowired(required = false) @Autowired(required = false)
private IEventDataSender eventSender; private IEventDataSender eventSender;
/** /**
* 生成过滤条件 * 生成过滤条件
* @param dto * @param dto
@@ -256,6 +262,17 @@ public class CourseServiceImpl implements ICourseService {
public PageList<Course> findPage(int pageIndex, int pageSize, CourseQueryDto dto) { public PageList<Course> findPage(int pageIndex, int pageSize, CourseQueryDto dto) {
List<IFieldFilter> filters = createFilters(dto); List<IFieldFilter> filters = createFilters(dto);
List<IFieldFilter> filters2 = createFilters(dto); List<IFieldFilter> 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<String> list = courseTeacherDao.sqlFindList(sql,dto.getProjectId(),dto.getOrgAid());
// String aid=getCurrent().getAccountId();
//有权限的查询，也同时查询出创建人的数据，在权限上 //有权限的查询，也同时查询出创建人的数据，在权限上
if(TempFilterConfig.Manager_CourseFile_ByOrgIds) { if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) { 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.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
filters.add((FieldFilters.in("orgId",strings))); filters.add((FieldFilters.in("orgId",strings)));
// filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); // filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){
filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds())));
}else{ }else{
filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
} }
}else { }else {
// filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); // filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
filters.add(FieldFilters.eq("orgId",dto.getOrgIds())); filters.add(FieldFilters.eq("orgId",dto.getOrgIds()));
if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){
filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds())));
}else{ }else{
filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
} }
@@ -287,8 +304,8 @@ public class CourseServiceImpl implements ICourseService {
//log.info("【"+dto.getOrgAid()+"】 机构ids没有， 只查询自己创建的课程"); //log.info("【"+dto.getOrgAid()+"】 机构ids没有， 只查询自己创建的课程");
//没有机构权限，只能查出自己创建的 //没有机构权限，只能查出自己创建的
// filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); // filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()){ if(dto.getCourseIds()!=null&&!dto.getCourseIds().isEmpty()&& !list.isEmpty()){
filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.eq("id",dto.getCourseIds()))); filters2.add(FieldFilters.or(FieldFilters.eq("sysCreateAid",dto.getOrgAid()),FieldFilters.in("id",dto.getCourseIds())));
}else{ }else{
filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); filters2.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
} }