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 927ffa77..6bd58984 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 @@ -406,11 +406,8 @@ public class ThirdApi { } //获取字典信息 - public List getDictItems() { + public List getDictItems(CommonSearchVo searcher) { 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()); 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 fc2ce837..7f82558c 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 @@ -7,6 +7,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.boe.feign.api.infrastructure.entity.CommonSearchVo; import com.xboe.api.ThirdApi; import com.xboe.module.course.dto.*; import org.apache.commons.lang3.StringUtils; @@ -169,8 +170,11 @@ public class CourseManageApi extends ApiBaseController{ List sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); List crowds=courseService.findCrowdByCourseId(id); - List dicts = thirdApi.getDictItems(); + CommonSearchVo searcher = new CommonSearchVo(); + searcher.setPid(380L); + searcher.setType(1); + List dicts = thirdApi.getDictItems(searcher); boolean isPermission = false; if(dicts != null && dicts.size() > 0){ isPermission = dicts.contains(course.getOrgId()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 0e905179..46fbeb55 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter; +import com.boe.feign.api.infrastructure.entity.CommonSearchVo; import com.xboe.api.ThirdApi; import com.xboe.constants.CacheName; import com.xboe.module.course.vo.TeacherVo; @@ -234,7 +235,10 @@ public class StudyCourseApi extends ApiBaseController{ rs.put("sections",sectionlist); rs.put("teachers",teachers); - List dicts = thirdApi.getDictItems(); + CommonSearchVo searcher = new CommonSearchVo(); + searcher.setCode("course_warn"); + searcher.setType(1); + List dicts = thirdApi.getDictItems(searcher); boolean isPermission = false; if(dicts != null && dicts.size() > 0){ isPermission = dicts.contains(course.getOrgId());