openharmony/account_os_account
1
0
Fork 0
mirror of https://gitee.com/openharmony/account_os_account synced 2024-11-23 02:00:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2154 修改stoi

Browse Source 
Merge pull request !2154 from swg/stoi
This commit is contained in:
openharmony_ci 2024-10-14 08:07:31 +00:00 committed by Gitee
commit 18d56c16be
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
services/accountmgr/src/osaccount/inner_os_account_manager.cpp
View File

@ -37,6 +37,7 @@
#include "os_account_subscribe_manager.h"
#include "parameter.h"
#include "parcel.h"
#include "string_ex.h"
#include <pthread.h>
#include <thread>
#include <unordered_set>
@ -906,19 +907,23 @@ ErrCode IInnerOsAccountManager::ValidateOsAccount(const OsAccountInfo &osAccount
if (result != ERR_OK) {
return result;
}
std::string localIdStr = std::to_string(osAccountInfo.GetLocalId());
int32_t id = osAccountInfo.GetLocalId();
for (const auto& element : accountIndexJson.items()) {
std::string localIdKey = element.key();
int32_t localId = 0;
if (!StrToInt(element.key(), localId)) {
ACCOUNT_LOGE("Convert localId failed");
continue;
}
auto value = element.value();
std::string localName = value[Constants::LOCAL_NAME].get<std::string>();
if ((osAccountInfo.GetLocalName() == localName) && (localIdKey != localIdStr)
&& !IsToBeRemoved(std::stoi(localIdKey))) {
if ((osAccountInfo.GetLocalName() == localName) && (localId != id)
&& !IsToBeRemoved(localId)) {
return ERR_ACCOUNT_COMMON_NAME_HAD_EXISTED;
}
if (!osAccountInfo.GetShortName().empty() && value.contains(Constants::SHORT_NAME)) {
std::string shortName = value[Constants::SHORT_NAME].get<std::string>();
if ((osAccountInfo.GetShortName() == shortName) && (localIdKey != localIdStr)
&& !IsToBeRemoved(std::stoi(localIdKey))) {
if ((osAccountInfo.GetShortName() == shortName) && (localId != id)
&& !IsToBeRemoved(localId)) {
return ERR_ACCOUNT_COMMON_SHORT_NAME_HAD_EXISTED;
}
}