hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-14 13:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PingCode-20251117' into release-20250328-master

Browse Source
This commit is contained in:
670788339
2025-12-09 18:16:28 +08:00
parent 17ada96efb 8664cc046b
commit 23b5d16614
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
View File

@@ -163,7 +163,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
//老师信息 //老师信息
//if(u.getUserType()!=null && u.getUserType()==2) { //if(u.getUserType()!=null && u.getUserType()==2) {
if ((user.getTeacher() != null && user.getTeacher()) || (user.getUserType() != null && user.getUserType() == 2)) { /*if ((user.getTeacher() != null && user.getTeacher()) || (user.getUserType() != null && user.getUserType() == 2)) {
Teacher t = teacherDao.get(user.getId()); Teacher t = teacherDao.get(user.getId());
log.info("用户有教师身份,处理教师身份"); log.info("用户有教师身份,处理教师身份");
if (t == null) { if (t == null) {
@@ -182,7 +182,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
} else { } else {
log.info("教师身份已存在，不再添加"); log.info("教师身份已存在，不再添加");
} }
} }*/
log.info("同步用户完成"); log.info("同步用户完成");
} }

4
servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
View File

@@ -57,4 +57,8 @@ public class CourseTeacher extends IdBaseEntity {
@Transient @Transient
private Integer teacherType; private Integer teacherType;
/**讲师头像*/
@Transient
private String photo;
} }

1
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -221,6 +221,7 @@ public class StudyCourseApi extends ApiBaseController{
ct.setRemark(t.getDescription()); ct.setRemark(t.getDescription());
ct.setSupplier(t.getSupplier()); ct.setSupplier(t.getSupplier());
ct.setTeacherType(t.getTeacherType()); ct.setTeacherType(t.getTeacherType());
ct.setPhoto(t.getPhoto());
} }
if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){ if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
List<String>list=new ArrayList<>(); List<String>list=new ArrayList<>();