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

snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postinfo/service/impl/ForumPostInfoServiceImpl.java

@@ -330,6 +330,21 @@ public class ForumPostInfoServiceImpl extends ServiceImpl<ForumPostInfoMapper, F
                 forumPostInfoVo.setForumContentCorrection(forumContentCorrection);
             }
         }
+        // 关联被指向的用户
+        if (forumPostInfoVo.getAppointUser() != null) {
+            String appointUser = forumPostInfoVo.getAppointUser();
+            StringBuffer sb = new StringBuffer();
+            String[] split = appointUser.split(",");
+            for (int i = 0; i < split.length; i++) {
+                JSONObject userByIdWithoutException = sysUserApi.getUserByIdWithoutException(split[i]);
+                if (i != split.length - 1) {
+                    sb.append(userByIdWithoutException.getStr("name")).append(",");
+                } else {
+                    sb.append(userByIdWithoutException.getStr("name"));
+                }
+            }
+            forumPostInfoVo.setAppointUser(sb.toString());
+        }
         return forumPostInfoVo;
     }
 

snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postreply/service/impl/ForumPostReplyServiceImpl.java

@@ -122,7 +122,7 @@ public class ForumPostReplyServiceImpl extends ServiceImpl<ForumPostReplyMapper,
                         QueryWrapper<ForumPostLike> queryWrapper3 = new QueryWrapper<>();
                         queryWrapper3.lambda().eq(ForumPostLike::getTargetId, forumPostReply.getReplyId());
                         queryWrapper3.lambda().eq(ForumPostLike::getUserId, loginUser.getId());
-                        Long aLong1 = forumPostLikeMapper.selectCount(queryWrapper1);
+                        Long aLong1 = forumPostLikeMapper.selectCount(queryWrapper3);
                         if (aLong1 > 0) {
                             forumPostReply.setIsLike(1);
                         } else {

snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivityrecord/entity/ForumSensitivityRecord.java

@@ -43,6 +43,12 @@ public class ForumSensitivityRecord {
     @ApiModelProperty(value = "帖子id", position = 3)
     private String postId;
 
+    /**
+     * 帖子标题
+     */
+    @TableField(exist = false)
+    private String postTitle;
+
     /** 过滤类型 0发帖 1回复 */
     @ApiModelProperty(value = "过滤类型 0发帖 1回复", position = 4)
     private Integer recordType;
@@ -51,6 +57,12 @@ public class ForumSensitivityRecord {
     @ApiModelProperty(value = "用户id", position = 5)
     private String userId;
 
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String userNickname;
+
     /** 删除标志 */
     @ApiModelProperty(value = "删除标志", position = 6)
     @TableLogic

snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivityrecord/service/impl/ForumSensitivityRecordServiceImpl.java

@@ -16,6 +16,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.forum.modular.postinfo.entity.ForumPostInfo;
+import vip.xiaonuo.forum.modular.postinfo.mapper.ForumPostInfoMapper;
 import vip.xiaonuo.forum.modular.sensitivityrecord.entity.ForumSensitivityRecord;
 import vip.xiaonuo.forum.modular.sensitivityrecord.mapper.ForumSensitivityRecordMapper;
 import vip.xiaonuo.forum.modular.sensitivityrecord.param.ForumSensitivityRecordAddParam;
@@ -31,7 +34,9 @@ import vip.xiaonuo.forum.modular.sensitivityrecord.param.ForumSensitivityRecordE
 import vip.xiaonuo.forum.modular.sensitivityrecord.param.ForumSensitivityRecordIdParam;
 import vip.xiaonuo.forum.modular.sensitivityrecord.param.ForumSensitivityRecordPageParam;
 import vip.xiaonuo.forum.modular.sensitivityrecord.service.ForumSensitivityRecordService;
+import vip.xiaonuo.sys.api.SysUserApi;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -44,6 +49,13 @@ import java.util.List;
 public class ForumSensitivityRecordServiceImpl extends ServiceImpl<ForumSensitivityRecordMapper, ForumSensitivityRecord> implements ForumSensitivityRecordService {
 
 
+    @Resource
+    private ForumPostInfoMapper forumPostInfoMapper;
+
+    @Resource
+    private SysUserApi sysUserApi;
+
+
     @Override
     public Page<ForumSensitivityRecord> page(ForumSensitivityRecordPageParam forumSensitivityRecordPageParam) {
         QueryWrapper<ForumSensitivityRecord> queryWrapper = new QueryWrapper<>();
@@ -54,7 +66,21 @@ public class ForumSensitivityRecordServiceImpl extends ServiceImpl<ForumSensitiv
         } else {
             queryWrapper.lambda().orderByAsc(ForumSensitivityRecord::getRecordId);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<ForumSensitivityRecord> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        if (page.getRecords().size() > 0) {
+            for (ForumSensitivityRecord record : page.getRecords()) {
+                ForumPostInfo forumPostInfo = forumPostInfoMapper.selectById(record.getPostId());
+                if (forumPostInfo != null) {
+                    record.setPostTitle(forumPostInfo.getPostTitle());
+                    // 关联用户信息
+                    JSONObject userByIdWithException = sysUserApi.getUserByIdWithException(record.getUserId());
+                    if (userByIdWithException != null) {
+                        record.setUserNickname(userByIdWithException.getStr("name"));
+                    }
+                }
+            }
+        }
+        return page;
     }
 
     @Transactional(rollbackFor = Exception.class)