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

+ 2 - 5
.idea/workspace.xml

@@ -2,10 +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/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_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -473,7 +470,7 @@
       <workItem from="1699857946428" duration="110000" />
       <workItem from="1699922141145" duration="14834000" />
       <workItem from="1699955684123" duration="243000" />
-      <workItem from="1700008106547" duration="19333000" />
+      <workItem from="1700008106547" duration="19637000" />
     </task>
     <servers />
   </component>

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

@@ -1128,7 +1128,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]])
+        $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]])
             ->leftJoin('Press i','t.first_id = i.id')
             ->alias('t')->count();
         $press_num = $press_reply_num + $press_comment_num;