Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-08 5f47726fe9179595878e8ce2df2bb5557eb4b6b6

 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();