diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index 1073641b..927ffa77 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -45,10 +45,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.concurrent.ForkJoinPool; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -407,4 +404,23 @@ public class ThirdApi { .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("-------delOnLineById = " + resp); } + + //获取字典信息 + public List getDictItems() { + try { + CommonSearchVo searcher = new CommonSearchVo(); + searcher.setPid(380L); + searcher.setType(1); + List dictList = dictRemoteClient.getList(searcher); + if(!Objects.isNull(dictList) && dictList.size() > 0){ + List dicts = dictList.stream().map(Dict::getValue).collect(Collectors.toList()); + return dicts; + }else { + return null; + } + } catch (Exception e) { + log.error("-------获取字典信息 = " + e.getMessage()); + } + return null; + } } 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..83ea6c9a 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 @@ -169,14 +169,20 @@ public class CourseManageApi extends ApiBaseController{ List sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); List crowds=courseService.findCrowdByCourseId(id); - - // + List dicts = thirdApi.getDictItems(); + + boolean isPermission = false; + if(dicts != null && dicts.size() > 0){ + isPermission = dicts.contains(course.getResOwner1()); + } + log.error("-------是否仅内网查看 = " + isPermission); rs.put("course",course); rs.put("contents",cclist); rs.put("sections",sectionlist); rs.put("teachers",teachers); rs.put("crowds",crowds); - + rs.put("isPermission",isPermission); + return success(rs);