修改接口

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -34,6 +34,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -224,9 +225,11 @@ public class NewsController {
         queryWrapper.disableSubLogicDel()
                 .eq(NewsRelation::getNewsId, dto.getNewsId())
                 .eq(ObjectUtil.isNotEmpty(dto.getReadMark()) && dto.getReadMark() > 0, NewsRelation::getReadMark, dto.getReadMark() == 1 ? 0 : 1)
+                .isNull(ObjectUtil.isNotEmpty(dto.getReplyMark()) && dto.getReplyMark() == 1, NewsRelation::getReplyContent)
+                .isNotNull(ObjectUtil.isNotEmpty(dto.getReplyMark()) && dto.getReplyMark() == 2, NewsRelation::getReplyContent)
                 .select(NewsRelation::getId)
                 .select(NewsRelation.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationVo.class).contains(x.getProperty()))
-                .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId);
+                .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId,ext->ext.selectAs(XjrUser::getName,NewsRelationVo::getUserName));
 
         IPage<NewsRelation> page = newsRelationService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<NewsRelationVo> pageOutput = ConventPage.getPageOutput(page, NewsRelationVo.class);

src/main/java/com/xjrsoft/module/oa/dto/NewsRelationPageDto.java

@@ -14,4 +14,7 @@ public class NewsRelationPageDto extends PageInput {
 
     @ApiModelProperty("阅读标记  0=全部 1=未读 2=已读")
     private Integer readMark;
+
+    @ApiModelProperty("回复  0=全部 1=未回复 2=已回复")
+    private Integer replyMark;
 }