Merge remote-tracking branch 'origin/master'

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

@@ -104,8 +104,13 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 			throw new BizException("机构不存在");
 		}
 		SysUser sysUser = sysUserDao.queryByPhone(existTenantInfo.getContactPhone());
-		if(Objects.nonNull(sysUser) && !newTenantInfo.getContactPhone().equals(sysUser.getPhone())){
-			throw new BizException("手机号已被占用");
+		if(sysUser == null){
+			throw new BizException("用户信息异常");
+		}
+		if(!newTenantInfo.getContactPhone().equals(sysUser.getPhone())){
+			if (sysUserDao.queryByPhone(newTenantInfo.getContactPhone()) != null) {
+				throw new BizException("手机号已被占用");
+			}
 		}
 		Organization organization = organizationDao.findByUserId(sysUser.getId());
 		if(newTenantInfo.getRoleIds() != null){