修复标签模块查询不显示以及新建标签

This commit is contained in:
王卓煜
2025-08-22 15:11:14 +08:00
parent 0e60251121
commit 6a04e5d58c
2 changed files with 12 additions and 19 deletions

View File

@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
import com.xboe.api.ThirdApi;
import com.xboe.module.course.dto.*;
import com.xboe.module.course.entity.*;
import com.xboe.module.course.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,19 +30,6 @@ import com.xboe.data.dto.UserOrgIds;
import com.xboe.data.outside.IOutSideDataService;
import com.xboe.data.service.IDataUserSyncService;
import com.xboe.module.assistance.service.IEmailService;
import com.xboe.module.course.entity.Course;
import com.xboe.module.course.entity.CourseContent;
import com.xboe.module.course.entity.CourseCrowd;
import com.xboe.module.course.entity.CourseHRBPAudit;
import com.xboe.module.course.entity.CourseSection;
import com.xboe.module.course.entity.CourseTeacher;
import com.xboe.module.course.entity.CourseUpdateLog;
import com.xboe.module.course.service.ICourseContentService;
import com.xboe.module.course.service.ICourseCrowdService;
import com.xboe.module.course.service.ICourseHRBPAuditService;
import com.xboe.module.course.service.ICourseSectionService;
import com.xboe.module.course.service.ICourseService;
import com.xboe.module.course.service.ICourseTeacherService;
import com.xboe.module.excel.ExportsExcelSenderUtil;
import com.xboe.standard.enums.BoedxContentType;
import com.xboe.standard.enums.BoedxCourseType;
@@ -91,10 +80,10 @@ public class CourseManageApi extends ApiBaseController{
@Resource
private ICourseHRBPAuditService hrbpAuditService;
@Resource
private ICourseTagService tagService;
@Resource
IOutSideDataService outSideDataService;
@Autowired
IDataUserSyncService userSyncService;
@Resource
@@ -169,14 +158,18 @@ public class CourseManageApi extends ApiBaseController{
List<CourseSection> sectionlist=sectionService.getByCourseId(id);
List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
//
if (StringUtils.isNotBlank(course.getTags())){
List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
rs.put("tagList", tagList);
}
rs.put("course",course);
rs.put("contents",cclist);
rs.put("sections",sectionlist);
rs.put("teachers",teachers);
rs.put("crowds",crowds);
return success(rs);

View File

@@ -180,11 +180,11 @@ public class CourseTagServiceImpl implements ICourseTagService {
courseTagRelation.setCourseId(courseId);
courseTagRelationDao.save(courseTagRelation);
}else {//1.2 否则修改标签
courseTag=courseTagList.get(0);
// 当同一标签被3个及以上课管创建时默认开启这个标签的公共化
if(courseTagList.get(0).getUseCount() >= 3){
courseTag.setIsPublic(true);
}
courseTag=courseTagList.get(0);
courseTag.setDeleted(false);//有可能是之前被删除的标签,这里恢复为有效
//查找改课程与这个标签是否已经建立关联关系
query=QueryBuilder.from(CourseTagRelation.class);