From d3a2e528586b9753faf4de99bc0a67675c077ca6 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 21 Aug 2024 17:54:30 +0800 Subject: [PATCH] fix some bug --- appsrc/baseservice/db/db_service.cpp | 10 +--------- appsrc/service/user_mgr_service.cpp | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/appsrc/baseservice/db/db_service.cpp b/appsrc/baseservice/db/db_service.cpp index c2b5da2..8b5af0b 100644 --- a/appsrc/baseservice/db/db_service.cpp +++ b/appsrc/baseservice/db/db_service.cpp @@ -117,15 +117,7 @@ shared_ptr DBService::delUser(int id) { auto usertable = make_storage(USER_DB_STRUCT); usertable.sync_schema(); - /** - * @brief find admin user - */ - auto admin = usertable.get_all(where(c(&User::uid) == "admin")); - ZCHECK(admin.size() == 1, "admin user not found"); - if (admin[0].id == id) { - logger->error("can not delete admin user"); - return nullptr; - } + auto remove_user = usertable.get_all(where(c(&User::id) == id)); if (remove_user.size() == 0) { logger->error("remove user fail, user not found"); diff --git a/appsrc/service/user_mgr_service.cpp b/appsrc/service/user_mgr_service.cpp index 2f6ba68..84b297b 100644 --- a/appsrc/service/user_mgr_service.cpp +++ b/appsrc/service/user_mgr_service.cpp @@ -60,7 +60,7 @@ void UserMgrService::delUser(shared_ptr cxt, int id) { void UserMgrService::updateUserUid(shared_ptr cxt, int id, string uid) { string olduid; auto user = m_db->updateUserUid(id, uid, olduid); - APPCHECK(!user, err::kappe_user_not_exist, fmt::format("user {} not exist", id)); + APPCHECK(user, err::kappe_user_not_exist, fmt::format("user {} not exist", id)); } void UserMgrService::getAllUser(shared_ptr cxt) { auto users = m_db->getAllUserJson();