From 28b7f981e5c781fbc0a6dca8e49470907dfa15f7 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 10 Sep 2024 17:11:47 +0800
Subject: [PATCH] v1.1.5

---
 README.md                                            | 3 +++
 appsrc/appsetting/project_port/basic/zappversion.hpp | 2 +-
 appsrc/baseservice/db/db_service.cpp                 | 5 +++--
 appsrc/service/user_mgr_service.cpp                  | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 48953b4..2db4a27 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,9 @@ VERSION 1.1.2
     1.修复TestPageMgrService 风机电流错误的BUG
 VERSION 1.1.3
     1. 修改用户接口
+VERSION 1.1.5
+    1. 修复用户行为时间戳错误的BUG
+    2. 修复usrMgr接口BUG
 
 TODO:
     添加用户增加用户查重检查
diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp
index 2d5ff5f..915b4ba 100644
--- a/appsrc/appsetting/project_port/basic/zappversion.hpp
+++ b/appsrc/appsetting/project_port/basic/zappversion.hpp
@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "1.1.3"
+#define VERSION      "1.1.5"
 #define PROJECT_NAME "TRANSMIT_DM"
\ No newline at end of file
diff --git a/appsrc/baseservice/db/db_service.cpp b/appsrc/baseservice/db/db_service.cpp
index e0bc989..1df4f08 100644
--- a/appsrc/baseservice/db/db_service.cpp
+++ b/appsrc/baseservice/db/db_service.cpp
@@ -99,7 +99,7 @@ void DBService::addUser(string name, string passwd, string roleType) {
 }
 shared_ptr<db::User> DBService::updateUserRoleType(int id, string roleType) {
   lock_guard<recursive_mutex> lock(lock_);
-  auto usertable = make_storage(USER_DB_STRUCT);
+  auto                        usertable = make_storage(USER_DB_STRUCT);
   usertable.sync_schema();
   auto user = usertable.get_all<User>(where(c(&User::id) == id));
   if (user.size() == 0) {
@@ -307,7 +307,8 @@ json DBService::getUserBehaviorRecordDescJson(int page, int page_size) {
 
 static string getTime() {
   struct tm tm = {0};
-
+  time_t    t  = ::time(nullptr);
+  localtime_r(&t, &tm);
   return fmt::format("{:0>4}-{:0>2}-{:0>2} {:0>2}:{:0>2}:{:0>2}", tm.tm_year + 1900,  //
                      tm.tm_mon + 1,                                                   //
                      tm.tm_mday,                                                      //
diff --git a/appsrc/service/user_mgr_service.cpp b/appsrc/service/user_mgr_service.cpp
index d0a8c13..48d01d1 100644
--- a/appsrc/service/user_mgr_service.cpp
+++ b/appsrc/service/user_mgr_service.cpp
@@ -48,7 +48,7 @@ void UserMgrService::chpasswd(shared_ptr<MsgProcessContext> cxt, int id, string
 
 void UserMgrService::changeUsrRoleType(shared_ptr<MsgProcessContext> cxt, int id, UsrRoleType roleType) {
   auto user = m_db->updateUserRoleType(id, roleType);
-  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::addUser(shared_ptr<MsgProcessContext> cxt, string name, string passwd, UsrRoleType roleType) {  //
@@ -56,7 +56,7 @@ void UserMgrService::addUser(shared_ptr<MsgProcessContext> cxt, string name, str
 }
 void UserMgrService::delUser(shared_ptr<MsgProcessContext> cxt, int id) {
   auto user = m_db->delUser(id);
-  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::updateUserName(shared_ptr<MsgProcessContext> cxt, int id, string name) {