Merge branch 'ledger20211008' into develop

application/services/marketing/MarketingService.php

@@ -1386,7 +1386,21 @@ class MarketingService
 
     public static function getMarketingList($params)
     {
-        $where['marketing_id'] = !empty($params['marketing_id']) ? $params['marketing_id'] : '';
+        
+        $where['ORDER'] = ["marketing_id" => "DESC"];
+
+        if (!empty($params['marketing_id'])) {
+            $where['marketing_id'] = !empty($params['marketing_id']) ? $params['marketing_id'] : '';
+        }
+
+        if(!empty($params['online_status'])){
+            $where['online_status'] = $params['online_status'];
+        }
+
+        if(!empty($params['life_account_id'])){
+            $where['life_account_id'] = $params['life_account_id'];
+        }
+
         if(!empty($params['marketing_type'])){
             $where['marketing_type'] = !empty($params['marketing_type']) ? $params['marketing_type'] : '';
         }