wupengfei 2 лет назад
Родитель
Сommit
052b01b963

+ 6 - 3
.idea/workspace.xml

@@ -4,6 +4,9 @@
     <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" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.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$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -200,7 +203,7 @@
       <workItem from="1670287594399" duration="11535000" />
       <workItem from="1670461023846" duration="27678000" />
       <workItem from="1670547445908" duration="12147000" />
-      <workItem from="1670633686675" duration="3589000" />
+      <workItem from="1670633686675" duration="3728000" />
     </task>
     <servers />
   </component>
@@ -299,10 +302,10 @@
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670637914341" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670486493063">
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670651691149">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670486493063" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670651691149" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

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

@@ -1062,7 +1062,7 @@ class Article extends Base
         if($title)  $sel_where[]  = ['i.title|i.label','like','%'.$title.'%'];
         $sel_where[]  = ['t.is_deleted','=',0];
         $sel_where[]  = ['t.lev','=',2];
-        $sel_where[]  = ['t.user_id','<>',$this->user_id];
+        //$sel_where[]  = ['t.user_id','<>',$this->user_id];
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = ArticleComment::where($sel_where)
             ->alias('t')

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

@@ -784,7 +784,7 @@ class Forum extends Base
         if($title)  $sel_where[]  = ['i.title','like','%'.$title.'%'];
         $sel_where[]  = ['t.is_deleted','=',0];
         $sel_where[]  = ['t.lev','>=',2];
-        $sel_where[]  = ['t.user_id','<>',$this->user_id];
+        //$sel_where[]  = ['t.user_id','<>',$this->user_id];
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = ForumReplyComment::where($sel_where)
             ->alias('t')

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

@@ -449,7 +449,7 @@ class Press extends Base
         if($title)  $sel_where[]  = ['i.title|i.label','like','%'.$title.'%'];
         $sel_where[]  = ['t.is_deleted','=',0];
         $sel_where[]  = ['t.lev','>=',2];
-        $sel_where[]  = ['t.user_id','<>',$this->user_id];
+        //$sel_where[]  = ['t.user_id','<>',$this->user_id];
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = PressComment::where($sel_where)
             ->alias('t')

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

@@ -945,7 +945,7 @@ class Video extends Base
         if($title)  $sel_where[]  = ['i.title|i.label','like','%'.$title.'%'];
         $sel_where[]  = ['t.is_deleted','=',0];
         $sel_where[]  = ['t.lev','=',2];
-        $sel_where[]  = ['t.user_id','<>',$this->user_id];
+        //$sel_where[]  = ['t.user_id','<>',$this->user_id];
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = VideoComment::where($sel_where)
             ->alias('t')