chuweiqiang 1 year ago
parent
commit
d6043684f9
2 changed files with 4 additions and 5 deletions
  1. 3 3
      .idea/workspace.xml
  2. 1 2
      application/api/controller/Datum.php

+ 3 - 3
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <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/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -580,7 +580,7 @@
       <workItem from="1711672177712" duration="21603000" />
       <workItem from="1711758657673" duration="11105000" />
       <workItem from="1711935199010" duration="23200000" />
-      <workItem from="1712104344631" duration="2236000" />
+      <workItem from="1712104344631" duration="6017000" />
     </task>
     <servers />
   </component>
@@ -743,7 +743,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
           <url>file://$PROJECT_DIR$/application/api/controller/Datum.php</url>
-          <line>779</line>
+          <line>778</line>
           <properties>
             <option name="className" value="\app\api\controller\Datum" />
             <option name="methodName" value="getDatumCollect" />

+ 1 - 2
application/api/controller/Datum.php

@@ -311,8 +311,7 @@ class Datum extends Base
         }])->find()->toArray();
         if((!$is_release && $detail['is_deleted'] == 1) || (!$is_release && $detail['status'] == 0))$this->error('该资料已下线');
         if($is_release){
-            $detail['url_arr'] = DatumUrl::field('id,release_time,datum_id,user_id,title,url,is_encrypt,pdf_clear,sort,is_vip,transmit_num,down_num,read_num,is_down,comment_switch')
-                ->where('release_time','< time',date("Y-m-d H:i:s"))->where('is_deleted',0)->where('datum_id',$detail['id'])->select()->toArray();
+            $detail['url_arr'] = DatumUrl::field('id,release_time,datum_id,user_id,title,url,is_encrypt,pdf_clear,sort,is_vip,transmit_num,down_num,read_num,is_down,comment_switch')->where('release_time','< time',date("Y-m-d H:i:s"))->where('is_deleted',0)->where('datum_id',$detail['id'])->select()->toArray();
         }
         $level_id = UserLevelRank::getUserVip($this->user_id);
         $detail['user_level']  = $level_id;