Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/UserCommentServiceImpl.java

@@ -61,7 +61,19 @@ public class UserCommentServiceImpl extends ServiceImpl<UserCommentMapper, UserC
         Page<UserCommentVo> page=userCommentMapper.selectCommentPid(CommonPageRequest.defaultPage(),userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
         List<UserCommentVo> list=userCommentMapper.selectCommentNoPid(userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
         page.getRecords().stream().forEach(item -> {
+           if(item.getUserId().equals(StpLoginUserUtil.getLoginUser().getId())){
+               item.setIsSelf(true);
+           }else{
+               item.setIsSelf(false);
+           }
             List<UserCommentVo> child= list.stream().filter(itemchild-> itemchild.getPid().equals(item.getId())).collect(Collectors.toList());
+            child.stream().forEach(itemchild -> {
+                if(itemchild.getUserId().equals(StpLoginUserUtil.getLoginUser().getId())){
+                    itemchild.setIsSelf(true);
+                }else{
+                    itemchild.setIsSelf(false);
+                }
+            });
             item.setChild(child);
             item.setChildSize(child.size());
         });
@@ -75,7 +87,19 @@ public class UserCommentServiceImpl extends ServiceImpl<UserCommentMapper, UserC
         Page<UserCommentVo> page=userCommentMapper.pageList(CommonPageRequest.defaultPage(),userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
         List<UserCommentVo> list=userCommentMapper.selectCommentNoPid(userCommentPageParam.getResourceId(),StpLoginUserUtil.getLoginUser().getId());
         page.getRecords().stream().forEach(item -> {
+            if(item.getUserId().equals(StpLoginUserUtil.getLoginUser().getId())){
+                item.setIsSelf(true);
+            }else{
+                item.setIsSelf(false);
+            }
             List<UserCommentVo> child= list.stream().filter(itemchild-> itemchild.getPid().equals(item.getId())).collect(Collectors.toList());
+            child.stream().forEach(itemchild -> {
+                if(itemchild.getUserId().equals(StpLoginUserUtil.getLoginUser().getId())){
+                    itemchild.setIsSelf(true);
+                }else{
+                    itemchild.setIsSelf(false);
+                }
+            });
             item.setChild(child);
             item.setChildSize(child.size());
         });

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/comment/UserCommentVo.java

@@ -76,6 +76,9 @@ public class UserCommentVo {
 
     private String avatar;
 
+    private Boolean isSelf;
+
+
     /** 孩子评论 */
     private List<UserCommentVo> child;