Merge branch 'lll_bugfix' of FanYanPeng/EAI-Backend into refactor

src/main/java/com/njuzr/eaibackend/enums/AssignmentStatus.java

@@ -1,6 +1,7 @@
 package com.njuzr.eaibackend.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
 
 /**
  * @author: Leonezhurui
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
  * @Package: EAI-Backend
  */
 
+@Getter
 public enum AssignmentStatus {
     NOT_STARTED(0, "NOT_STARTED"),
     PROCEEDING(1, "PROCEEDING"),
@@ -23,11 +25,4 @@ public enum AssignmentStatus {
         this.status = status;
     }
 
-    public int getCode() {
-        return code;
-    }
-
-    public String getStatus() {
-        return status;
-    }
 }

src/main/java/com/njuzr/eaibackend/service/impl/CourseServiceImpl.java

@@ -536,7 +536,7 @@ public class CourseServiceImpl implements CourseService {
             }
         }
         // 2. getTeacherPid
-        if(StringUtils.isNotBlank(course.getTeacherPid())){
+        if(StringUtils.isBlank(course.getTeacherIds()) && StringUtils.isNotBlank(course.getTeacherPid())){
             res.setTeacherPid(Long.valueOf(course.getTeacherPid()));
             teacherNames.add(userMapper.selectNameByPid(Long.valueOf(course.getTeacherPid())));
         }