From 6a04e5d58c2a312d89839329c8856d6f605af667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 22 Aug 2025 15:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E7=AD=BE=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9F=A5=E8=AF=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=96=B0=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CourseManageApi.java | 29 +++++++------------ .../service/impl/CourseTagServiceImpl.java | 2 +- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 6e517c90..a7143440 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -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 sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); List crowds=courseService.findCrowdByCourseId(id); - - // + if (StringUtils.isNotBlank(course.getTags())){ + List 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); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java index fdc7a18d..b7534035 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java @@ -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);