Browse Source

1.修复在线论坛的bug

jasonk5949 7 tháng trước cách đây
mục cha
commit
47d4b19c3d

+ 2 - 2
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/controller/ForumReportInfoController.java

@@ -60,7 +60,7 @@ public class ForumReportInfoController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取论坛-帖子举报信息表分页")
-    @SaCheckPermission("/forum/reportinfo/page")
+//    @SaCheckPermission("/forum/reportinfo/page")
     @GetMapping("/forum/reportinfo/page")
     public CommonResult<Page<ForumReportInfo>> page(ForumReportInfoPageParam forumReportInfoPageParam) {
         return CommonResult.data(forumReportInfoService.page(forumReportInfoPageParam));
@@ -113,7 +113,7 @@ public class ForumReportInfoController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除论坛-帖子举报信息表")
     @CommonLog("删除论坛-帖子举报信息表")
-    @SaCheckPermission("/forum/reportinfo/delete")
+//    @SaCheckPermission("/forum/reportinfo/delete")
     @PostMapping("/forum/reportinfo/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumReportInfoIdParam> forumReportInfoIdParamList) {

+ 22 - 0
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/entity/ForumReportInfo.java

@@ -84,4 +84,26 @@ public class ForumReportInfo {
     @ApiModelProperty(value = "修改用户", position = 12)
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
+
+    /** 举报人用户名称 */
+    @TableField(exist = false)
+    private String userNickname;
+
+    /**
+     * 帖子名称
+     */
+    @TableField(exist = false)
+    private String postTitle;
+
+    /**
+     * 帖子类型 0普通帖子 1技术支持 2内容纠错
+     */
+    @TableField(exist = false)
+    private Integer postType;
+
+    /**
+     * 帖子状态 0正常 1关闭
+     */
+    @TableField(exist = false)
+    private Integer postStatus;
 }

+ 19 - 1
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/service/impl/ForumReportInfoServiceImpl.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;
@@ -36,6 +37,7 @@ import vip.xiaonuo.forum.modular.reportinfo.param.ForumReportInfoEditParam;
 import vip.xiaonuo.forum.modular.reportinfo.param.ForumReportInfoIdParam;
 import vip.xiaonuo.forum.modular.reportinfo.param.ForumReportInfoPageParam;
 import vip.xiaonuo.forum.modular.reportinfo.service.ForumReportInfoService;
+import vip.xiaonuo.sys.api.SysUserApi;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -52,6 +54,9 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
     @Resource
     private ForumPostInfoMapper forumPostInfoMapper;
 
+    @Resource
+    private SysUserApi sysUserApi;
+
 
     @Override
     public Page<ForumReportInfo> page(ForumReportInfoPageParam forumReportInfoPageParam) {
@@ -63,7 +68,20 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
         } else {
             queryWrapper.lambda().orderByAsc(ForumReportInfo::getReportId);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<ForumReportInfo> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        if (page.getRecords().size() > 0) {
+            for (ForumReportInfo record : page.getRecords()) {
+                ForumPostInfo forumPostInfo = forumPostInfoMapper.selectById(record.getPostId());
+                record.setPostTitle(forumPostInfo.getPostTitle());
+                record.setPostType(forumPostInfo.getPostType());
+                record.setPostStatus(forumPostInfo.getPostStatus());
+                JSONObject userByIdWithException = sysUserApi.getUserByIdWithException(record.getUserId());
+                if (userByIdWithException != null) {
+                    record.setUserNickname(userByIdWithException.getStr("name"));
+                }
+            }
+        }
+        return page;
     }
 
     @Transactional(rollbackFor = Exception.class)