提交课程

This commit is contained in:
daihh
2023-03-02 17:26:14 +08:00
parent bed13b49c9
commit d6cd690744
2 changed files with 18 additions and 18 deletions

View File

@@ -254,22 +254,24 @@ public class CourseServiceImpl implements ICourseService {
List<IFieldFilter> filters = createFilters(dto); List<IFieldFilter> filters = createFilters(dto);
//有权限的查询,也同时查询出创建人的数据,在权限上 //有权限的查询,也同时查询出创建人的数据,在权限上
if(TempFilterConfig.Manager_CourseFile_ByOrgIds && StringUtils.isNotBlank(dto.getOrgAid())) {
if(StringUtil.isNotBlank(dto.getOrgIds())){ if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
if(dto.getOrgIds().contains(",")){ if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) {
String[] split = dto.getOrgIds().split(",");
List<String> strings = Arrays.asList(split); if(StringUtil.isNotBlank(dto.getOrgIds())){
//filters.add(FieldFilters.in("orgId",strings)); if(dto.getOrgIds().contains(",")){
filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); String[] split = dto.getOrgIds().split(",");
}else { List<String> strings = Arrays.asList(split);
//filters.add(FieldFilters.eq("orgId",dto.getOrgIds())); filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); }else {
} filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid())));
}else { }
//没有机构权限,只能查出自己创建的 }else {
filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); //没有机构权限,只能查出自己创建的
} filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid()));
} }
}
}
//自动添加过滤已删除 //自动添加过滤已删除
filters.add(FieldFilters.eq("deleted",false)); filters.add(FieldFilters.eq("deleted",false));

View File

@@ -1,7 +1,6 @@
package com.xboe.school.study.api; package com.xboe.school.study.api;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -143,7 +142,6 @@ public class StudyCourseESApi extends ApiBaseController{
} }
} }
return success(true); return success(true);
} }
} }