From 3758133932c7b9c28347ced06c196508f93c1fc0 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 23 May 2023 11:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=A0=87=E7=AD=BE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=A2=E4=BA=BAID=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/feedback_model.php | 63 ++++++++++++++++-----------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php
index 33198f7e..e270ad81 100644
--- a/application/models/feedback_model.php
+++ b/application/models/feedback_model.php
@@ -14,7 +14,7 @@ class Feedback_model extends CI_Model {
 
         $feedback_query =
             $this->HT->query("
-            select top 20
+            select top 40
               tad_content, tai_customerid, tai_title, tai_getdate, tai_url
             from Eva_TAInfo 
                 left join Eva_TADetail on TAD_TAI_SN=TAI_SN
@@ -23,19 +23,23 @@ class Feedback_model extends CI_Model {
 
         $feedback_result = $feedback_query->result();
         $feedback_list = [];
+        $customer_id_list = [];
 
         foreach ($feedback_result as $feedback_row) {
             $createdOn = new DateTime($feedback_row->tai_getdate);
             $createdOnString = $createdOn->format('M Y');
-    
-            $feedback = [
+            $feedback_count = COUNT($feedback_list);
+            if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {  
+              $feedback = [
                 'title' => $feedback_row->tai_title,
                 'customer' => $feedback_row->tai_customerid,
                 'content' => $feedback_row->tad_content,
                 'url' => $feedback_row->tai_url,
                 'createdOn' => $createdOnString
-            ];
-            $feedback_list[] = $feedback;
+              ];
+              $feedback_list[] = $feedback;
+              $customer_id_list[] = $feedback_row->tai_customerid;
+            }
         }
 
         return $feedback_list;
@@ -83,7 +87,7 @@ class Feedback_model extends CI_Model {
 
         $feedback_query =
             $this->HT->query("
-            select top 20
+            select top 40
               tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
             from Eva_TAInfo 
                 left join Eva_TADetail on TAD_TAI_SN=TAI_SN
@@ -95,22 +99,27 @@ class Feedback_model extends CI_Model {
         $first_city_num = $feedback_query->num_rows();
         $feedback_result = $feedback_query->result();
         $feedback_list = [];
+        $customer_id_list = [];
 
         foreach ($feedback_result as $feedback_row) {
             $createdOn = new DateTime($feedback_row->tai_getdate);
             $createdOnString = $createdOn->format('M Y');
-    
-            $feedback = [
-                'title' => $feedback_row->tai_title,
-                'customer' => $feedback_row->tai_customerid,
-                'content' => $feedback_row->tad_content,
-                'url' => $feedback_row->tai_url,
-                'createdOn' => $createdOnString
-            ];
-            $feedback_list[] = $feedback;
+            $feedback_count = COUNT($feedback_list);
+
+            if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {  
+              $feedback = [
+                  'title' => $feedback_row->tai_title,
+                  'customer' => $feedback_row->tai_customerid,
+                  'content' => $feedback_row->tad_content,
+                  'url' => $feedback_row->tai_url,
+                  'createdOn' => $createdOnString
+              ];
+              $feedback_list[] = $feedback;
+              $customer_id_list[] = $feedback_row->tai_customerid;
+            }
         }
 
-        $enough_count = 20 - $first_city_num;
+        $enough_count = 40 - $first_city_num;
         
         if ($enough_count > 0 && count($city_name_list) > 1) {
             
@@ -129,15 +138,19 @@ class Feedback_model extends CI_Model {
             foreach ($feedback_result as $feedback_row) {
                 $createdOn = new DateTime($feedback_row->tai_getdate);
                 $createdOnString = $createdOn->format('M Y');
-        
-                $feedback = [
-                    'title' => $feedback_row->tai_title,
-                    'customer' => $feedback_row->tai_customerid,
-                    'content' => $feedback_row->tad_content,
-                    'url' => $feedback_row->tai_url,
-                    'createdOn' => $createdOnString
-                ];
-                $feedback_list[] = $feedback;
+                $feedback_count = COUNT($feedback_list);
+
+                if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {  
+                  $feedback = [
+                      'title' => $feedback_row->tai_title,
+                      'customer' => $feedback_row->tai_customerid,
+                      'content' => $feedback_row->tad_content,
+                      'url' => $feedback_row->tai_url,
+                      'createdOn' => $createdOnString
+                  ];
+                  $feedback_list[] = $feedback;
+                  $customer_id_list[] = $feedback_row->tai_customerid;
+                }
             }
         }