diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java index 85fa695c..85f2e3ff 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java @@ -49,4 +49,11 @@ public class CourseTeacher extends IdBaseEntity { @Transient private String code; + /**供应商*/ + @Transient + private String supplier; + + /**讲师类型 1 内部讲师 2外部讲师*/ + @Transient + private Integer teacherType; } 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 8663e426..cba98a57 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 @@ -204,6 +204,8 @@ public class StudyCourseApi extends ApiBaseController{ Teacher t = teacherService.get(ct.getTeacherId()); if(t!=null) { ct.setRemark(t.getDescription()); + ct.setSupplier(t.getSupplier()); + ct.setTeacherType(t.getTeacherType()); } if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){ Listlist=new ArrayList<>(); @@ -212,11 +214,11 @@ public class StudyCourseApi extends ApiBaseController{ redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus()); //设置过期时间为1天 redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS); - if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){ + if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1){ ct.setTeacherName("BOE教师"); } } - if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){ + if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && t.getTeacherType() == 1){ ct.setTeacherName("BOE教师"); } }