1

.idea/workspace.xml

@@ -3,8 +3,9 @@
   <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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/UserMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserMessage.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -404,7 +405,7 @@
       <workItem from="1692579530643" duration="3954000" />
       <workItem from="1692665781192" duration="20574000" />
       <workItem from="1692752372482" duration="15659000" />
-      <workItem from="1692838782793" duration="1006000" />
+      <workItem from="1692838782793" duration="1720000" />
     </task>
     <servers />
   </component>
@@ -591,7 +592,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
           <url>file://$PROJECT_DIR$/application/api/controller/Datum.php</url>
-          <line>743</line>
+          <line>745</line>
           <properties>
             <option name="className" value="\app\api\controller\Datum" />
             <option name="methodName" value="getDatumCollect" />

application/api/controller/Article.php

@@ -728,8 +728,10 @@ class Article extends Base
             if($check_tags) {
                 ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$article_id,'item_id'=>$item_id])->delete();
             }else{
+                $p_user_id = ArticleItem::where('id',$item_id)->value('user_id');
+                $is_read = $p_user_id == $this->user_id ? 1 : 0;
                 Data::save('ArticleLike',
-                    ['user_id'=>$this->user_id,'article_id'=>$article_id,'item_id'=>$item_id],'user_id',
+                    ['user_id'=>$this->user_id,'article_id'=>$article_id,'item_id'=>$item_id,'is_read'=>$is_read],'user_id',
                     ['user_id'=>$this->user_id,'article_id'=>$article_id,'item_id'=>$item_id]);
                 $ret_val = 1;
             }
@@ -857,8 +859,10 @@ class Article extends Base
             ArticleCommentLike::where(['user_id'=>$this->user_id,'like_id'=>$comment_id])->delete();
            // ArticleItem::where('id',$comment_id)->setDec('like_times');
         }else{
+            $p_user_id = ArticleComment::where('id',$comment_id)->value('user_id');
+            $is_read = $p_user_id == $this->user_id ? 1 : 0;
             Data::save('ArticleCommentLike',
-                ['user_id'=>$this->user_id,'like_id'=>$comment_id,],'user_id',
+                ['user_id'=>$this->user_id,'like_id'=>$comment_id,'is_read'=>$is_read],'user_id',
                 ['user_id'=>$this->user_id,'like_id'=>$comment_id]);
             $ret_val = 1;
           //  ArticleItem::where('id',$comment_id)->setInc('like_times');
@@ -1860,7 +1864,7 @@ class Article extends Base
     {
         $all_list = ArticleItem::where('user_id',$this->user_id)->where('is_deleted',0)->column('id');
         $user_info = $this->userInfo('name,headimg');
-        $list =  ArticleLike::where([['l.item_id','in',$all_list],['l.to_deleted','=',0]])
+        $list =  ArticleLike::where([['l.item_id','in',$all_list],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->field('l.id,l.user_id,m.name user_name,m.headimg,l.create_at,v.cover,v.title,v.read_num,x.title series_title,v.article_id,l.item_id')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
@@ -1874,7 +1878,7 @@ class Article extends Base
             $v['app_logo']  = $user_info['headimg'];
             $v['read_num']  = numTransform($v['read_num']);
         });
-        $total_num =  ArticleLike::where([['item_id','in',$all_list],['l.to_deleted','=',0]])
+        $total_num =  ArticleLike::where([['item_id','in',$all_list],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
             ->leftJoin('ArticleItem v','v.id  = l.item_id')
@@ -1908,7 +1912,7 @@ class Article extends Base
     public function praiseMyComment()
     {
         $user_info = $this->userInfo('name,headimg');
-        $list =  ArticleCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0]])
+        $list =  ArticleCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->field('l.id,l.user_id,m.name user_name,m.headimg,l.create_at,v.cover,c.content,v.title,v.read_num,x.title series_title,v.article_id,c.item_id,v.user_id buid')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
@@ -1928,7 +1932,7 @@ class Article extends Base
             $v['read_num']  = numTransform($v['read_num']);
             $v['is_normal']  = CheckPower::checkModulesPower($v['article_id'],$v['item_id'],$this->request->controller());
         });
-        $total_num =   ArticleCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0]])
+        $total_num =   ArticleCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')->leftJoin('StoreMember m','m.id  = l.user_id')
             ->leftJoin('ArticleComment c','c.id  = l.like_id')
             ->leftJoin('ArticleItem v','v.id  = c.item_id')->count();

application/api/controller/Datum.php

@@ -488,8 +488,10 @@ class Datum extends Base
         if($check_tags) {
             DatumLike::where(['user_id'=>$this->user_id,'datum_id'=>$datum_id,'url_id'=>$url_id])->delete();
         }else{
+            $p_user_id = DatumUrl::where('id',$url_id)->value('user_id');
+            $is_read = $p_user_id == $this->user_id ? 1 : 0;
             Data::save('DatumLike',
-                ['user_id'=>$this->user_id,'datum_id'=>$datum_id,'url_id'=>$url_id],'user_id',
+                ['user_id'=>$this->user_id,'datum_id'=>$datum_id,'url_id'=>$url_id,'is_read'=>$is_read],'user_id',
                 ['user_id'=>$this->user_id,'datum_id'=>$datum_id,'url_id'=>$url_id]);
             $ret_val = 1;
         }
@@ -1095,8 +1097,10 @@ class Datum extends Base
             DatumCommentLike::where(['user_id'=>$this->user_id,'like_id'=>$comment_id])->delete();
             // ArticleItem::where('id',$comment_id)->setDec('like_times');
         }else{
+            $p_user_id = DatumComment::where('id',$comment_id)->value('user_id');
+            $is_read = $p_user_id == $this->user_id ? 1 : 0;
             Data::save('DatumCommentLike',
-                ['user_id'=>$this->user_id,'like_id'=>$comment_id,],'user_id',
+                ['user_id'=>$this->user_id,'like_id'=>$comment_id,'is_read'=>$is_read],'user_id',
                 ['user_id'=>$this->user_id,'like_id'=>$comment_id]);
             $ret_val = 1;
             //  ArticleItem::where('id',$comment_id)->setInc('like_times');
@@ -1211,7 +1215,7 @@ class Datum extends Base
     public function praiseMyComment()
     {
         $user_info = $this->userInfo('name,headimg');
-        $list =  DatumCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0]])
+        $list =  DatumCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->field('l.id,l.user_id,l.like_id,m.name user_name,m.headimg,l.create_at,v.url,v.title,v.read_num,c.content,x.title series_title,v.datum_id,c.url_id,v.user_id buid')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
@@ -1230,7 +1234,7 @@ class Datum extends Base
             $v['read_num']  = numTransform($v['read_num']);
             $v['is_normal'] = CheckPower::checkModulesPower($v['datum_id'],$v['url_id'],$this->request->controller());
         });
-        $total_num =   DatumCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0]])
+        $total_num =   DatumCommentLike::where([['c.user_id','=',$this->user_id],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')->leftJoin('StoreMember m','m.id  = l.user_id')
             ->leftJoin('DatumComment c','c.id  = l.like_id')
             ->leftJoin('DatumUrl v','v.id  = c.url_id')->count();
@@ -1261,7 +1265,7 @@ class Datum extends Base
     {
         $all_list = DatumUrl::where('user_id',$this->user_id)->where('is_deleted',0)->column('id');
         $user_info = $this->userInfo('name,headimg');
-        $list =  DatumLike::where([['l.url_id','in',$all_list],['l.to_deleted','=',0]])
+        $list =  DatumLike::where([['l.url_id','in',$all_list],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->field('l.id,l.user_id,m.name user_name,m.headimg,l.create_at,v.url,v.title,v.read_num,x.title series_title,v.datum_id,l.url_id')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
@@ -1275,7 +1279,7 @@ class Datum extends Base
             $v['read_num']  = numTransform($v['read_num']);
             $v['is_normal'] = CheckPower::checkModulesPower($v['datum_id'],$v['url_id'],$this->request->controller());
         });
-        $total_num = DatumLike::where([['url_id','in',$all_list],['l.to_deleted','=',0]])
+        $total_num = DatumLike::where([['url_id','in',$all_list],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
             ->alias('l')
             ->leftJoin('StoreMember m','m.id  = l.user_id')
             ->leftJoin('DatumUrl v','v.id  = l.url_id')

application/api/controller/Video.php

@@ -1849,7 +1849,7 @@ class Video extends Base
              $v['app_logo']  = $user_info['headimg'];
              $v['read_num']  = numTransform($v['read_num']);
          });
-         $total_num = VideoCommentLike::where([['type','=',2],['like_id','in',$all_video],['l.to_deleted','=',0]])
+         $total_num = VideoCommentLike::where([['type','=',2],['like_id','in',$all_video],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
              ->alias('l')
              ->leftJoin('StoreMember m','m.id  = l.user_id')
              ->leftJoin('VideoUrl v','v.id  = l.like_id')
@@ -1901,7 +1901,7 @@ class Video extends Base
              $v['app_logo']  = $user_info['headimg'];
              $v['read_num']  = numTransform($v['read_num']);
          });
-         $total_num =   VideoCommentLike::where([['l.type','=',1],['c.user_id','=',$this->user_id],['l.to_deleted','=',0]])
+         $total_num =   VideoCommentLike::where([['l.type','=',1],['c.user_id','=',$this->user_id],['l.to_deleted','=',0],['l.user_id','<>',$this->user_id]])
              ->alias('l') ->leftJoin('StoreMember m','m.id  = l.user_id')
              ->leftJoin('VideoComment c','c.id  = l.like_id')
              ->leftJoin('VideoUrl v','v.id  = c.url_id')->count();