From 4a1845ab43395de6838e535bdf7ca932316ee9ec Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 10:30:18 +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/VideoServer/QiaoJia/DB/LDBTool.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
index 3e4f741..f1a6d89 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/LDBTool.cpp
@@ -501,7 +501,7 @@
std::list<Record_Cam_Dev> lst;
QSqlTableModel pModel(NULL, m_db);
pModel.setTable("cam_dev");
- pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null "));
+ pModel.setFilter(QObject::tr("cam_dev_id != '' and cam_dev_id is not null"));
pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange
pModel.select();
@@ -511,6 +511,7 @@
Record_Cam_Dev lChannelRec;
QSqlRecord rec = pModel.record(i);
lChannelRec.n_id = rec.value("id").toInt();
+ lChannelRec.type = rec.value("type").toInt();
lChannelRec.str_cam_dev_id = rec.value("cam_dev_id").toString();
lChannelRec.str_name = rec.value("name").toString();
lChannelRec.str_addr = rec.value("addr").toString();
--
Gitblit v1.8.0