Procházet zdrojové kódy

fix:修复教师课程显示

BaiQi před 1 rokem
rodič
revize
21875d084d

+ 8 - 4
src/main/java/com/njuzr/eaibackend/service/impl/CourseServiceImpl.java

@@ -2,6 +2,7 @@ package com.njuzr.eaibackend.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njuzr.eaibackend.dto.course.CourseDTO;
 import com.njuzr.eaibackend.dto.course.CourseQueryDTO;
@@ -100,7 +101,10 @@ public class CourseServiceImpl implements CourseService {
         if (courseQueryDTO.getCourseId() != null) { // courseId直接判断是否相等
             wrapper.eq("course_id", courseQueryDTO.getCourseId());
         }
-        if (courseQueryDTO.getTeacherId() != null) { // 模糊匹配teacherIds中是否包含这个字段
+        if (courseQueryDTO.getTeacherPid() != null) { // courseId直接判断是否相等
+            log.info("有pid:{}", courseQueryDTO.getTeacherPid());
+            wrapper.eq("teacher_portal_id", courseQueryDTO.getTeacherPid());
+        } else if (courseQueryDTO.getTeacherId() != null) { // 模糊匹配teacherIds中是否包含这个字段
             wrapper.apply("FIND_IN_SET({0}, teacher_ids) > 0", courseQueryDTO.getTeacherId());
             // wrapper.like("teacher_ids", "%" + courseQueryDTO.getTeacherId() + "%"); // 模糊匹配
         }
@@ -331,20 +335,20 @@ public class CourseServiceImpl implements CourseService {
         // 组装教师名字
         List<String> teacherNames = new ArrayList<>();
         // 1.getTeacherIds
-        if(course.getTeacherIds() != null){
+        if(StringUtils.isNotBlank(course.getTeacherIds())){
             res.setTeacherIds(ConvertUtil.stringToList(course.getTeacherIds(), Long::valueOf));
             for (Long teacherId : res.getTeacherIds()) {
                 teacherNames.add(userMapper.selectNameById(teacherId));
             }
-            res.setTeacherNames(teacherNames);
             if (course.getCourseImages() != null) {
                 res.setCourseImages(ConvertUtil.stringToList(course.getCourseImages(), String::valueOf));
             }
         }
         // 2. getTeacherPid
-        if(course.getTeacherPid() != null){
+        if(StringUtils.isNotBlank(course.getTeacherPid())){
             teacherNames.add(userMapper.selectNameByPid(Long.valueOf(course.getTeacherPid())));
         }
+        res.setTeacherNames(teacherNames);
         return res;
     }