Merge branch 'zcwy-0613-wjw' into dev0525

This commit is contained in:
xiaozhequ
2024-07-04 12:33:49 +08:00
2 changed files with 2 additions and 3 deletions

View File

@@ -371,8 +371,8 @@ public class Course extends BaseEntity {
@Column(name = "ref_type",length=32,columnDefinition="varchar(32) comment '反向关联的类型'")
private String refType;
private Boolean isPermission;
@Transient
private Boolean isPermission=true;
@Transient
private String orgName;

View File

@@ -411,7 +411,6 @@ public class CourseServiceImpl implements ICourseService {
Set<String> seache = getSeache(dto);
//查出全部的课程
List<Course> listByFilters2 = courseDao.findListByFilters(oc, filters2);
listByFilters2.forEach(e->e.setIsPermission(true));
if (TempFilterConfig.Manager_CourseFile_ByOrgIds) {
if (dto.getIsSystemAdmin() == null || !dto.getIsSystemAdmin()) {
List<String> finalStrings = strings;