From f5f7ab3bc5e5561d8cf9e2560c21595ccafa8127 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 13:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xboe/api/ThirdApi.java       |  6 +++---
 .../xboe/module/course/api/CourseManageApi.java    | 10 +++++++---
 .../com/xboe/school/study/api/StudyCourseApi.java  | 14 ++++++++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

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 6bd58984..56b0c76a 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,12 +406,12 @@ public class ThirdApi {
     }
 
     //获取字典信息
-    public List<String> getDictItems(CommonSearchVo searcher) {
+    public List<Dict> getDictItems(CommonSearchVo searcher) {
         try {
             List<Dict> dictList = dictRemoteClient.getList(searcher);
             if(!Objects.isNull(dictList) && dictList.size() > 0){
-               List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-               return dicts;
+//               List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
+               return dictList;
             }else {
                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 91005fd7..c58f3f25 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
@@ -2,12 +2,14 @@
 
 import java.io.OutputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
+import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
@@ -174,10 +176,12 @@ public class CourseManageApi extends ApiBaseController{
         CommonSearchVo searcher = new CommonSearchVo();
         searcher.setPid(637L);
         searcher.setType(1);
-		List<String> dicts = thirdApi.getDictItems(searcher);
+		List<Dict> dictList = thirdApi.getDictItems(searcher);
 		boolean isPermission = false;
-        if(dicts != null && dicts.size() > 0){
+        if(dictList != null && dictList.size() > 0){
+			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
 			isPermission = dicts.contains(course.getOrgId());
+			rs.put("dicts",dicts);
 		}
 		log.error("-------是否仅内网查看 = " + isPermission);
 		rs.put("course",course);
@@ -186,7 +190,7 @@ public class CourseManageApi extends ApiBaseController{
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
 		rs.put("isPermission",isPermission);
-		rs.put("dicts",dicts);
+
 
 		
 		return success(rs);
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 713353d9..cb76847f 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
@@ -11,6 +11,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.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
@@ -240,8 +241,9 @@ public class StudyCourseApi extends ApiBaseController{
 			CommonSearchVo searcher = new CommonSearchVo();
 			searcher.setPid(637L);
 			searcher.setType(1);
-			List<String> dicts = thirdApi.getDictItems(searcher);
-			if(dicts != null && dicts.size() > 0){
+			List<Dict> dictList = thirdApi.getDictItems(searcher);
+			if(dictList != null && dictList.size() > 0){
+				List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
 				// 选择仅内网 并且字典中配置了此课程资源归属，那么只能内网观看 返回 truw
 				isPermission = dicts.contains(course.getOrgId());
 			}
@@ -251,8 +253,12 @@ public class StudyCourseApi extends ApiBaseController{
 		CommonSearchVo warn = new CommonSearchVo();
 		warn.setCode("course_warn");
 		warn.setType(1);
-		List<String> warns = thirdApi.getDictItems(warn);
-		rs.put("warn",warns.get(0));
+		List<Dict> warns = thirdApi.getDictItems(warn);
+		if(warns != null && warns.size() > 0){
+			rs.put("warn",warns.get(0).getValue());
+			rs.put("warnTitle",warns.get(0).getName());
+		}
+
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
 		if(pass==true && sc==null) {