Merge branch 'zcwy1124' into 'master'

判空

See merge request !50
This commit is contained in:
joshen
2023-11-24 17:17:41 +08:00

View File

@@ -3,6 +3,7 @@ package com.xboe.module.course.api;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.xboe.api.ThirdApi; import com.xboe.api.ThirdApi;
@@ -220,7 +221,10 @@ public class CourseFullTextApi extends ApiBaseController{
token = request.getHeader("token"); token = request.getHeader("token");
} }
List<String> offCourseId = thirdApi.getOffCourseId(dto.getUserId(),token); List<String> offCourseId = thirdApi.getOffCourseId(dto.getUserId(),token);
String offCourseIds = String.join(",", offCourseId); String offCourseIds = "";
if (!Objects.isNull(offCourseId) && offCourseId.size() > 0){
offCourseIds = String.join(",", offCourseId);
}
// String offCourseIds="123.311"; // String offCourseIds="123.311";
//根据userId查询报名的课程 //根据userId查询报名的课程
List<String>courseId=IStudyCourseService.getCourseId(dto.getUserId()); List<String>courseId=IStudyCourseService.getCourseId(dto.getUserId());