From 5f47726fe9179595878e8ce2df2bb5557eb4b6b6 Mon Sep 17 00:00:00 2001 From: xuxiuxi <554325746@qq.com> Date: 星期五, 08 三月 2019 23:23:56 +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/vss/dao/VssLocalSettingTblSqliteDao.h | 15 ++++++++++++--- QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h index 5873e72..93aba70 100755 --- a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h +++ b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h @@ -80,7 +80,10 @@ QMutexLocker mutexLocker(m_mutexVisit);//TODO QSqlTableModel pModel(NULL, *m_db); pModel.setTable(CamDev_TABLE_NAME); - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); @@ -117,7 +120,10 @@ QMutexLocker mutexLocker(m_mutexVisit);//TODO QSqlTableModel pModel(NULL, *m_db); pModel.setTable(CamDev_TABLE_NAME); - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); @@ -177,7 +183,10 @@ std::list<Record_Cut_Video_info> lst; QSqlTableModel pModel(NULL, *m_db); pModel.setTable(CamDev_TABLE_NAME);; - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/VssLocalSettingTblSqliteDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/VssLocalSettingTblSqliteDao.h index 04b5d63..990265b 100755 --- a/QiaoJiaSystem/DataManagerServer/vss/dao/VssLocalSettingTblSqliteDao.h +++ b/QiaoJiaSystem/DataManagerServer/vss/dao/VssLocalSettingTblSqliteDao.h @@ -73,7 +73,10 @@ QMutexLocker mutexLocker(m_mutexVisit);//TODO QSqlTableModel pModel(NULL, *m_db); pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME); - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); @@ -110,7 +113,10 @@ QMutexLocker mutexLocker(m_mutexVisit);//TODO QSqlTableModel pModel(NULL, *m_db); pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME); - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); @@ -170,7 +176,10 @@ std::list<Record_Cut_Video_info> lst; QSqlTableModel pModel(NULL, *m_db); pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME);; - pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str())); + if (whereKeyValues.size() > 0) { + auto filter = QObject::tr((string(" 1=1 ")+getWhereColumnNameValuePair(whereKeyValues)).c_str()); + pModel.setFilter(filter); + } pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange pModel.select(); -- Gitblit v1.8.0