From 2f9c132e22a041b825fb46e9f913f942c7cc6dc2 Mon Sep 17 00:00:00 2001
From: "joshen@zcwytd.com" <12345678A>
Date: Fri, 24 Nov 2023 18:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87token=E8=8E=B7=E5=8F=96userid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/module/course/api/CourseFullTextApi.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
index 5f97e5ac..85e9eba7 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
@@ -7,6 +7,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.xboe.api.ThirdApi;
+import com.xboe.data.dto.UserData;
+import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyCourseService;
 import com.xboe.system.organization.service.IOrganizationService;
@@ -63,6 +65,10 @@ public class CourseFullTextApi  extends ApiBaseController{
 	@Autowired
 	ThirdApi  thirdApi;
 
+	@Autowired
+	IOutSideDataService outsideDataService;
+
+
 	/**
 	 * 课程的初始化
 	 * @return
@@ -212,6 +218,7 @@ public class CourseFullTextApi  extends ApiBaseController{
 	 */
 	@PostMapping("/search")
 	public JsonResponse<PageList<CourseFullText>> search(Pagination pager, CourseQueryDto dto, Integer minDuration, Integer maxDuration, HttpServletRequest request){
+
 		//获取例外人员id
 		List<String> userId = thirdApi.getUserId();
 		String userIds = String.join(",", userId);
@@ -221,6 +228,13 @@ public class CourseFullTextApi  extends ApiBaseController{
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader("token");
 		}
+
+		if (dto.getUserId() == null ){
+			log.info("通过token获取userid dto.getUserId() = " + dto.getUserId() + ",token = " + token);
+			UserData userData = outsideDataService.getUserInfoByToken(token);
+			dto.setUserId(userData.getId());
+		}
+
 		log.info("根据userId查询面授课id dto.getUserId() = " + dto.getUserId() + ",token = " + token);
 		List<String> offCourseId = thirdApi.getOffCourseId(dto.getUserId(),token);
 		log.info("根据userId查询面授课id offCourseId.size() = " + offCourseId );