From 6c8f1689d545a6384046b79558e06ba32ec5dacf Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期三, 06 三月 2019 11:48:22 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 2 +-
QiaoJiaSystem/build/config.db | 0
QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index d6a2220..e36f449 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -154,7 +154,7 @@
HCCore
hcnetsdk
pthread
-# mysqlpp
+ mysqlpp
)
#add_executable(Apptest
diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
index b7f3873..d264b87 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
@@ -39,11 +39,11 @@
rec.setGenerated("id", false);
pModel.insertRecord(-1, rec);//TODO
-
m_db->transaction();//寮�濮嬩簨鍔℃搷浣�
-
+ auto id1 = pModel.query().lastInsertId();
if (pModel.submitAll()) {
m_db->commit();//鎻愪氦
+ responseJsonValue["id"] = pModel.query().lastInsertId().toString().toStdString();
responseJsonValue["success"] = "true";
responseJsonValue["message"] = "娣诲姞鎴愬姛锛�";
} else {
diff --git a/QiaoJiaSystem/build/config.db b/QiaoJiaSystem/build/config.db
index 942ed4d..5a78d83 100755
--- a/QiaoJiaSystem/build/config.db
+++ b/QiaoJiaSystem/build/config.db
Binary files differ
--
Gitblit v1.8.0