From e7700fd3ff8af9ae2d9acb8ee0f3b36c392ec503 Mon Sep 17 00:00:00 2001 From: yaodan <1421553879@qq.com> Date: Wed, 24 May 2023 22:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=BC=B9=E7=AA=97=E7=9A=84=E5=88=97=E8=A1=A8=E4=BC=9A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8C=85=E5=90=AB=E8=87=AA=E5=B7=B1=E5=9C=A8?= =?UTF-8?q?=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...legesJurisdictionCurriculumResourcesController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java index 6e8829b9..47633ae0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -17,6 +17,7 @@ import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO; import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService; import com.ibeetl.jlw.service.UniversitiesCollegesService; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.beetl.sql.core.engine.PageQuery; @@ -273,13 +274,18 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ */ @GetMapping(MODEL + "/getTheoryAddOpenCourseList.json") @ResponseBody - public JsonResult>> getTheoryAddOpenCourseList(@SCoreUser CoreUser coreUser, Integer courseType) { + public JsonResult>> getTheoryAddOpenCourseList(Long teacherOpenCourseId,@SCoreUser CoreUser coreUser, Integer courseType) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); } if(ObjectUtil.isNull(coreUser)){ return JsonResult.failMessage("院校不存在"); } - return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getTheoryAddOpenCourseList(coreUser.getOrgId(),courseType)); + List> theoryAddOpenCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getTheoryAddOpenCourseList(coreUser.getOrgId(), courseType); + if (CollectionUtils.isNotEmpty(theoryAddOpenCourseList)&&null!=teacherOpenCourseId) { + theoryAddOpenCourseList.removeIf(map -> ObjectUtil.equals(map.get("courseInfoId"),teacherOpenCourseId)); + } + + return JsonResult.success(theoryAddOpenCourseList); } }