dzx 10 месяцев назад
Родитель
Сommit
2628a9bde9

+ 11 - 0
src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
@@ -42,6 +43,7 @@ import com.xjrsoft.module.organization.mapper.DepartmentMapper;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.entity.SystemUpdateMessage;
 import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.system.service.ISystemUpdateMessageService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
@@ -80,6 +82,7 @@ public class NewsController {
     private DepartmentMapper departmentMapper;
     private INewsRelationConfigService newsRelationConfigService;
     private final ISystemUpdateMessageService systemUpdateMessageService;
+    private final IFileService fileService;
 
 
     @GetMapping
@@ -107,6 +110,14 @@ public class NewsController {
     @ApiOperation(value = "获取接受新闻分页")
     public RT<PageOutput<NewsPageVo>> receiptBox(NewsPageDto dto) {
         IPage<NewsPageVo> page = newsService.receiptBox(dto);
+        for (NewsPageVo record : page.getRecords()) {
+            File file = fileService.getOne(
+                    new QueryWrapper<File>().lambda()
+                            .eq(File::getFolderId, record.getCover())
+                            .eq(File::getDeleteMark, DeleteMark.NODELETE.getCode())
+            );
+            record.setCoverUrl(file.getFileUrl());
+        }
         PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
         return RT.ok(pageOutput);
     }

+ 3 - 0
src/main/java/com/xjrsoft/module/oa/vo/NewsPageVo.java

@@ -187,4 +187,7 @@ public class NewsPageVo {
 
     @ApiModelProperty("是否已读(2:是 0:否)")
     private Integer readMark;
+
+    @ApiModelProperty("封面url")
+    private String coverUrl;
 }