Merge pull request #191 from Targoman/create_apitoken

fix extrafilter error
Targoman · Aug 10, 2022 · 0e9dd0e · 0e9dd0e
2 parents 245a544 + 811a30a
commit 0e9dd0e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Interfaces/API/intfSQLBasedModule.cpp b/Interfaces/API/intfSQLBasedModule.cpp
@@ -105,7 +105,7 @@ QVariantMap intfSQLBasedModule::SelectOne(
         _fnTouchQuery(Query);
 
     if (_extraFilters.isEmpty() == false)
-        Query.andWhere(_extraFilters);
+        Query.andWhere(clsCondition().andCond(_extraFilters));
 
     QVariantMap Result = Query.one();
 
@@ -134,21 +134,21 @@ QVariantMap intfSQLBasedModule::SelectOne(
 
     ORMSelectQuery Query = this->makeSelectQuery(APICALLBOOM_PARAM, "", _translate)
         .setPksByPath(_pksByPath)
-        .pageIndex(_pageIndex)
-        .pageSize(_pageSize)
         .addCSVCols(_cols)
         .orderBy(_orderBy)
         .groupBy(_groupBy)
         .addFilters(_filters)
 //        .andWhere(_extraFilters)
+        .pageIndex(_pageIndex)
+        .pageSize(_pageSize)
         .setCacheTime(_cacheTime)
     ;
 
     if (_fnTouchQuery != nullptr)
         _fnTouchQuery(Query);
 
     if (_extraFilters.isEmpty() == false)
-        Query.andWhere(_extraFilters);
+        Query.andWhere(clsCondition().andCond(_extraFilters));
 
     /*QVariantList*/ TAPI::stuTable Result = Query.all();
 
@@ -177,21 +177,21 @@ TAPI::stuTable intfSQLBasedModule::SelectAllWithCount(
 
     ORMSelectQuery Query = this->makeSelectQuery(APICALLBOOM_PARAM, "", _translate)
         .setPksByPath(_pksByPath)
-        .pageIndex(_pageIndex)
-        .pageSize(_pageSize)
         .addCSVCols(_cols)
         .orderBy(_orderBy)
         .groupBy(_groupBy)
         .addFilters(_filters)
 //        .andWhere(_extraFilters)
+        .pageIndex(_pageIndex)
+        .pageSize(_pageSize)
         .setCacheTime(_cacheTime)
     ;
 
     if (_fnTouchQuery != nullptr)
         _fnTouchQuery(Query);
 
     if (_extraFilters.isEmpty() == false)
-        Query.andWhere(_extraFilters);
+        Query.andWhere(clsCondition().andCond(_extraFilters));
 
     TAPI::stuTable Result = Query.allWithCount();