chuweiqiang 11 months ago
parent
commit
46cd772c8f
2 changed files with 7 additions and 4 deletions
  1. 5 2
      .idea/workspace.xml
  2. 2 2
      application/api/controller/Article.php

+ 5 - 2
.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?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="" />
+    <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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -593,7 +596,7 @@
       <workItem from="1713916802858" duration="19129000" />
       <workItem from="1714004926744" duration="26309000" />
       <workItem from="1714091498498" duration="11116000" />
-      <workItem from="1714109915098" duration="6447000" />
+      <workItem from="1714109915098" duration="6474000" />
     </task>
     <servers />
   </component>

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

@@ -387,8 +387,8 @@ class Article extends Base
         $sort_type = input('get.sort_type',1);
         $is_release = UserLearn::checkRelease($this->user_id,3,input('get.id'));
         $detail = ArticleIntro::where($sel_where)->find()->toArray();
-        $detail['item_list'] = $detail['item_list3'];
-        unset($detail['item_list3']);
+//        $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('该图文已下线');