Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -95,8 +95,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 					Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
 					sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
 				}
-				if(!user.getUserType().contains("SYSTEM")){
-					user.setUserType(user.getUserType() + ",SYSTEM");
+				if(StringUtils.isNotEmpty(user.getUserType())){
+					if(!user.getUserType().contains("SYSTEM")){
+						user.setUserType(user.getUserType() + ",SYSTEM");
+					}
+				}else {
+					user.setUserType("SYSTEM");
 				}
 				user.setRealName(organ.getContactName());
 				user.setPhone(organ.getContactPhone());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -69,6 +69,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 				sysUser.setUpdateTime(date);
 				sysUserDao.update(sysUser);
 			}else if (teacher1.getDelFlag() == 1){
+				teacher.setUserId(id);
 				if(StringUtils.isEmpty(user.getUserType())){
 					sysUser.setUserType("TEACHER");
 				}else {