chuweiqiang il y a 11 mois
Parent
commit
446758d824
2 fichiers modifiés avec 14 ajouts et 17 suppressions
  1. 2 5
      .idea/workspace.xml
  2. 12 12
      application/api/controller/Article.php

+ 2 - 5
.idea/workspace.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
-    </list>
+    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -594,7 +591,7 @@
       <workItem from="1713400278236" duration="25153000" />
       <workItem from="1713486783613" duration="18361000" />
       <workItem from="1713916802858" duration="19129000" />
-      <workItem from="1714004926744" duration="25082000" />
+      <workItem from="1714004926744" duration="25124000" />
     </task>
     <servers />
   </component>

+ 12 - 12
application/api/controller/Article.php

@@ -400,18 +400,18 @@ class Article extends Base
             }
             return  $is_release ? $query->order($order) : $query->where('status',1)->order($order);
         }])->find()->toArray();
-        $detail['item_list'] = $detail['item_list3'];
-        unset($detail['item_list3']);
-        $detail['is_release'] = $is_release;
-        if($is_release && $detail['is_deleted'] )$this->error('该图文已下线');
-        if(!$detail['is_release'] && ($detail['is_deleted'] == 1 || $detail['status'] == 0))$this->error('该图文已下线');
-        if(in_array($this->source_type,[1])) $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
-        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
-        $detail['read_num'] = numTransform($detail['read_num']);
-        $detail['follow_switch'] =  PlatformSwitch::checkSwitch($this->user_id,$detail['id'],3);
-        $recently_id = UserTrack::getRecentlyTrack($this->user_id,3,$detail['id']);
-        $level_id = UserLevelRank::getUserVip($this->user_id);
-        $detail['user_level']  = $level_id;
+//        $detail['item_list'] = $detail['item_list3'];
+//        unset($detail['item_list3']);
+//        $detail['is_release'] = $is_release;
+//        if($is_release && $detail['is_deleted'] )$this->error('该图文已下线');
+//        if(!$detail['is_release'] && ($detail['is_deleted'] == 1 || $detail['status'] == 0))$this->error('该图文已下线');
+//        if(in_array($this->source_type,[1])) $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
+//        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
+//        $detail['read_num'] = numTransform($detail['read_num']);
+//        $detail['follow_switch'] =  PlatformSwitch::checkSwitch($this->user_id,$detail['id'],3);
+//        $recently_id = UserTrack::getRecentlyTrack($this->user_id,3,$detail['id']);
+//        $level_id = UserLevelRank::getUserVip($this->user_id);
+//        $detail['user_level']  = $level_id;
 
 //        foreach ($detail['item_list'] as &$dv) {
 //            if(in_array($this->source_type,[1])) unset($dv['pdf_clear']);