1

.idea/workspace.xml

@@ -3,7 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Demand.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recruit.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -198,7 +203,7 @@
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
       <workItem from="1670287594399" duration="11535000" />
-      <workItem from="1670461023846" duration="5050000" />
+      <workItem from="1670461023846" duration="5118000" />
     </task>
     <servers />
   </component>

application/api/controller/Activity.php

@@ -69,7 +69,7 @@ class Activity extends Base
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
         $field = 'a.id,cover,a.user_id,title,a.status,address,label,start_time,end_time,ladder,price,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_activity';
-        $order_by_two = 'read_num';
+        $order_by_two = 'a.read_num';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id  WHERE a.is_deleted = 0 AND a.status = 1  ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         array_walk($list,function (&$v,$k){

application/api/controller/Demand.php

@@ -86,7 +86,7 @@ class Demand extends Base
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
         $field = 'a.id,cover,money,user_id,label,title,cover,is_over,content,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_platform_demand';
-        $order_by_two = 'id';
+        $order_by_two = 'a.id';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id WHERE a.is_deleted = 0 AND a.status = 1 AND  a.is_over = ".$is_over ." ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         array_walk($list,function (&$v,$k)use ($app_name,$app_logo){

application/api/controller/Forum.php

@@ -109,7 +109,7 @@ class Forum extends Base
             if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
             $field = ' a.id,a.title,a.content,a.label,a.level,a.browse_num,a.sort,a.create_at,IFNULL(is_recommend,0) is_recommend, u.name,u.headimg';
             $table = 'dd_user_forum';
-            $order_by_two = 'read_num';
+            $order_by_two = 'a.read_num';
             $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id LEFT JOIN dd_store_member as u ON a.user_id =u.id   WHERE a.is_deleted = 0 AND a.status =1 AND a.level <= $max_level ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
             $list = Db::query($sql);
             array_walk($list,function (&$v,$k) use ($app_name,$app_logo){

application/api/controller/Mall.php

@@ -93,7 +93,7 @@ class Mall extends Base
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
         $field = 'a.id,name,cover,low_price,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_store_goods';
-        $order_by_two = 'id';
+        $order_by_two = 'a.id';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id WHERE a.status =1 AND a.is_deleted = 0 ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         $this->success('ok',['list'=>$list]);

application/api/controller/Recruit.php

@@ -134,7 +134,7 @@ class Recruit extends Base
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
         $field = 'a.id,title,a.user_id,label,salary,principal,hr_headimg,address,price_min,price_max,company,education,experience_min,experience_max,welfare,province,city,county,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_recruit';
-        $order_by_two = 'id';
+        $order_by_two = 'a.id';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id WHERE a.status = 1 AND a.is_deleted = 0 ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         array_walk($list,function (&$v,$k)use ($app_name,$app_logo){

application/api/controller/Supplier.php

@@ -217,7 +217,7 @@ class Supplier extends Base
         if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
         $field = 'a.id,a.supplier_id,a.name,a.label,a.cover,a.read_num,IFNULL(is_recommend,0) is_recommend ';
         $table = 'dd_supplier_goods';
-        $order_by_two = 'read_num';
+        $order_by_two = 'a.read_num';
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id LEFT JOIN dd_supplier as k ON a.supplier_id = k.id  WHERE a.is_deleted = 0 AND a.status = 1 AND k.status =1 AND k.is_deleted = 0  ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         array_walk($list,function (&$v,$k){