From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 06 三月 2019 11:52:47 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/build/DataWebServer | 0
QiaoJiaSystem/build/config.db | 0
QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
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/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index d9d47cd..01f43df 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
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