Merge remote-tracking branch 'origin/master'

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

@@ -79,12 +79,13 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			}
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
-				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
 				organ.setUserId(user.getId());
 				organDao.insert(organ);
+				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + organ.getId());
+				organDao.update(organ);
 				//新增用户角色
 				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
@@ -125,9 +126,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);
 
-		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + sysUser.getId());
 		organ.setUserId(sysUser.getId());
 		organDao.insert(organ);
+		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + organ.getId());
+		organDao.update(organ);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		if(sysUser.getRoles() != null){

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

@@ -107,6 +107,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		if(Objects.nonNull(sysUser) && !newTenantInfo.getContactPhone().equals(sysUser.getPhone())){
 			throw new BizException("手机号已被占用");
 		}
+		Organization organization = organizationDao.findByUserId(sysUser.getId());
 		if(newTenantInfo.getRoleIds() != null){
 			//删除当前用户角色
 			sysUserDao.delEmployeeRole(sysUser.getId());
@@ -115,10 +116,14 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		}
 		if(StringUtils.isNotBlank(newTenantInfo.getContactName())){
 			sysUser.setRealName(newTenantInfo.getContactName());
+			organization.setContactName(newTenantInfo.getContactName());
+			organization.setName(newTenantInfo.getName());
 		}
 		if(StringUtils.isNotBlank(newTenantInfo.getContactPhone())){
 			sysUser.setPhone(newTenantInfo.getContactPhone());
+			organization.setContactPhone(newTenantInfo.getContactPhone());
 		}
+		organizationDao.update(organization);
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 		tenantInfoDao.update(newTenantInfo);