student před 1 dnem
rodič
revize
b2bfc5b397
2 změnil soubory, kde provedl 4 přidání a 6 odebrání
  1. 1 0
      .gitignore
  2. 3 6
      ApiWeb/ApiProcessToken/Models/systemDataAccess.cs

+ 1 - 0
.gitignore

@@ -34,3 +34,4 @@ msbuild.wrn
 .vs/
 /vasgw/VasgwLottery/nbproject/private/
 /vasgw/VasgwLottery/dist/
+.andromity/

+ 3 - 6
ApiWeb/ApiProcessToken/Models/systemDataAccess.cs

@@ -49,8 +49,7 @@ namespace ResfullApi.Models
                                           PUD.IS_STEP_2, PUD.STEP_2_TIME, PUD.ERROR_CODE, PUD.IS_SUCCESS, PUD.INSERT_TIME, PUD.LAST_UPDATE,PUD.MSG_CONTENT
                                    FROM PUSH_USSD_DETAIL PUD
                                         LEFT JOIN B_CAMPAIGN CAMP ON PUD.CAMPAIGN_ID = CAMP.ID
-                                   WHERE 1=1
-                                     AND (PUD.CAMPAIGN_ID IS NULL OR PUD.CAMPAIGN_ID < 2000000 OR PUD.CAMPAIGN_ID > 2999999)";
+                                   WHERE 1=1";
 
                 string where = "";
                 if (!string.IsNullOrEmpty(v_campaignId) && v_campaignId != "-1")
@@ -182,8 +181,7 @@ namespace ResfullApi.Models
                                    LEFT JOIN B_CAMPAIGN c ON rcd.CAMPAIGN_ID = c.ID
                                    LEFT JOIN B_CAMPAIGN_ADD ca ON c.ID = ca.CAMPAIGN_ID AND rcd.SERVICE_ID = ca.SERVICE_ADD_ID AND ca.IS_DELETE = 0
                                    LEFT JOIN B_SERVICE s ON (ca.SERVICE_ADD_ID = s.ID OR (ca.SERVICE_ADD_ID IS NULL AND rcd.SERVICE_ID = s.ID))
-                                   WHERE 1=1
-                                     AND (rcd.CAMPAIGN_ID IS NULL OR rcd.CAMPAIGN_ID < 2000000 OR rcd.CAMPAIGN_ID > 2999999)";
+                                   WHERE 1=1";
                 string dataSql = @"SELECT rcd.ID, rcd.REPORT_DATE, rcd.CAMPAIGN_ID, c.NAME AS CAMPAIGN_NAME,
                                    c.PRIORITY, c.IS_DEFAULT, c.IS_MYSERVICE, c.ADD_TYPE,
                                    rcd.SERVICE_ID, s.NAME AS SERVICE_NAME,
@@ -194,8 +192,7 @@ namespace ResfullApi.Models
                                    LEFT JOIN B_CAMPAIGN c ON rcd.CAMPAIGN_ID = c.ID
                                    LEFT JOIN B_CAMPAIGN_ADD ca ON c.ID = ca.CAMPAIGN_ID AND rcd.SERVICE_ID = ca.SERVICE_ADD_ID AND ca.IS_DELETE = 0
                                    LEFT JOIN B_SERVICE s ON (ca.SERVICE_ADD_ID = s.ID OR (ca.SERVICE_ADD_ID IS NULL AND rcd.SERVICE_ID = s.ID))
-                                   WHERE 1=1
-                                     AND (rcd.CAMPAIGN_ID IS NULL OR rcd.CAMPAIGN_ID < 2000000 OR rcd.CAMPAIGN_ID > 2999999)";
+                                   WHERE 1=1";
                 
                 // Add filters
                 if (v_id != null && v_id != "-1")