|
@@ -16,6 +16,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
+import cn.hutool.json.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
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.ForumReportInfoIdParam;
|
|
|
import vip.xiaonuo.forum.modular.reportinfo.param.ForumReportInfoPageParam;
|
|
import vip.xiaonuo.forum.modular.reportinfo.param.ForumReportInfoPageParam;
|
|
|
import vip.xiaonuo.forum.modular.reportinfo.service.ForumReportInfoService;
|
|
import vip.xiaonuo.forum.modular.reportinfo.service.ForumReportInfoService;
|
|
|
|
|
+import vip.xiaonuo.sys.api.SysUserApi;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -52,6 +54,9 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
|
|
|
@Resource
|
|
@Resource
|
|
|
private ForumPostInfoMapper forumPostInfoMapper;
|
|
private ForumPostInfoMapper forumPostInfoMapper;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private SysUserApi sysUserApi;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Page<ForumReportInfo> page(ForumReportInfoPageParam forumReportInfoPageParam) {
|
|
public Page<ForumReportInfo> page(ForumReportInfoPageParam forumReportInfoPageParam) {
|
|
@@ -63,7 +68,20 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
|
|
|
} else {
|
|
} else {
|
|
|
queryWrapper.lambda().orderByAsc(ForumReportInfo::getReportId);
|
|
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)
|
|
@Transactional(rollbackFor = Exception.class)
|