chuweiqiang преди 1 година
родител
ревизия
1a1230201c
променени са 2 файла, в които са добавени 2 реда и са изтрити 7 реда
  1. 1 6
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Expedite.php

+ 1 - 6
.idea/workspace.xml

@@ -2,12 +2,7 @@
 <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/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single_error.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -482,7 +477,7 @@
       <workItem from="1700267230720" duration="19260000" />
       <workItem from="1700440204810" duration="14773000" />
       <workItem from="1700526499424" duration="11662000" />
-      <workItem from="1700613253175" duration="2321000" />
+      <workItem from="1700613253175" duration="2599000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/api/controller/Expedite.php

@@ -1152,7 +1152,7 @@ class Expedite extends Base
         $press_all_comment = PressComment::where(['user_id'=>$this->user_id,'is_deleted'=>0])->column('id');
         $press_reply_num =  PressComment::where([['t.is_deleted','=',0],['t.lev','>=',2],['t.user_id','<>',$this->user_id],['is_read','=',0],['t.pid','in',implode(',',$press_all_comment)]])->alias('t')->count();
         // 评论我的
-        $press_comment_num = PressComment::where([['t.is_deleted','=',0],['i.user_id','=',$this->user_id],['t.is_read','=',0],['t.user_id','<>',$this->user_id]])
+        $press_comment_num = PressComment::where([['t.is_deleted','=',0],['t.pid','=',0],['i.user_id','=',$this->user_id],['t.is_read','=',0],['t.user_id','<>',$this->user_id]])
             ->leftJoin('Press i','t.first_id = i.id')
             ->alias('t')->count();
         $press_num = $press_reply_num + $press_comment_num;