mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-11 03:46:50 +08:00
Merge branch 's-master'
This commit is contained in:
@@ -129,8 +129,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
|
|||||||
userDao.flush();
|
userDao.flush();
|
||||||
|
|
||||||
//老师信息
|
//老师信息
|
||||||
if(u.getUserType()!=null && u.getUserType()==2) {
|
//if(u.getUserType()!=null && u.getUserType()==2) {
|
||||||
Teacher t = teacherDao.get(u.getId());
|
if((user.getTeacher()!=null && user.getTeacher()) || (user.getUserType()!=null && user.getUserType()==2)){
|
||||||
|
Teacher t = teacherDao.get(user.getId());
|
||||||
log.info("用户有教师身份,处理教师身份");
|
log.info("用户有教师身份,处理教师身份");
|
||||||
if(t==null) {
|
if(t==null) {
|
||||||
log.info("添加教师身份");
|
log.info("添加教师身份");
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
|
|||||||
//@SpringBootTest
|
//@SpringBootTest
|
||||||
class BoeServerAllApplicationTests {
|
class BoeServerAllApplicationTests {
|
||||||
|
|
||||||
@Test
|
//@Test
|
||||||
void contextLoads() {
|
void contextLoads() {
|
||||||
|
|
||||||
// for(int i=0;i<100;i++) {
|
// for(int i=0;i<100;i++) {
|
||||||
@@ -13,4 +13,6 @@ class BoeServerAllApplicationTests {
|
|||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user