Merge branch 's-master'

This commit is contained in:
BOE\10867418
2023-06-14 11:35:01 +08:00
2 changed files with 6 additions and 3 deletions

View File

@@ -129,8 +129,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
userDao.flush();
//老师信息
if(u.getUserType()!=null && u.getUserType()==2) {
Teacher t = teacherDao.get(u.getId());
//if(u.getUserType()!=null && u.getUserType()==2) {
if((user.getTeacher()!=null && user.getTeacher()) || (user.getUserType()!=null && user.getUserType()==2)){
Teacher t = teacherDao.get(user.getId());
log.info("用户有教师身份,处理教师身份");
if(t==null) {
log.info("添加教师身份");

View File

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
//@SpringBootTest
class BoeServerAllApplicationTests {
@Test
//@Test
void contextLoads() {
// for(int i=0;i<100;i++) {
@@ -13,4 +13,6 @@ class BoeServerAllApplicationTests {
// }
}
}