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

提交课程

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,15 +254,16 @@ 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(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) {
if(StringUtil.isNotBlank(dto.getOrgIds())){ if(StringUtil.isNotBlank(dto.getOrgIds())){
if(dto.getOrgIds().contains(",")){ if(dto.getOrgIds().contains(",")){
String[] split = dto.getOrgIds().split(","); String[] split = dto.getOrgIds().split(",");
List<String> strings = Arrays.asList(split); List<String> strings = Arrays.asList(split);
//filters.add(FieldFilters.in("orgId",strings));
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())));
}else { }else {
//filters.add(FieldFilters.eq("orgId",dto.getOrgIds()));
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())));
} }
}else { }else {
@@ -270,6 +271,7 @@ public class CourseServiceImpl implements ICourseService {
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));

2
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
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);
} }
} }