修改新闻返回

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.oa.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 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.metadata.IPage;
@@ -73,7 +74,8 @@ public class NewsController {
     public R box(NewsPageDto dto) {
         MPJLambdaWrapper<News> wrapper = MPJWrappers.<News>lambdaJoin()
                 .distinct()
-                .eq(News::getTypeId, dto.getType())
+                .eq(ObjectUtil.isNotEmpty(dto.getType()) && dto.getType() > 0, News::getTypeId, dto.getType())
+                .eq(ObjectUtil.isNotEmpty(dto.getClassId()) && dto.getClassId() > 0, News::getClassId, dto.getClassId())
                 .like(StrUtil.isNotBlank(dto.getKeyword()), News::getFullHead, dto.getKeyword())
                 .leftJoin(NewsRelation.class, onWrapper -> onWrapper.eq(NewsRelation::getNewsId, News::getId).eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()))
                 .selectAs(NewsRelation::getId, NewsPageVo::getReadId)

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

@@ -17,7 +17,9 @@ import javax.validation.constraints.NotNull;
 public class NewsPageDto extends PageInput {
 
     @ApiModelProperty(value = "类型（1-新闻2-公告）")
-    @Min(value = 1, message = "类型必须大于0")
     @NotNull(message = "类型不能为空！")
     private Integer type;
+
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
 }

src/main/java/com/xjrsoft/module/oa/vo/NewsPageVo.java

@@ -118,4 +118,10 @@ public class NewsPageVo {
      */
     @ApiModelProperty("已读数据id，该字段有值说明已读")
     private Long readId;
+
+    /**
+     * 班级(base_class)
+     */
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
 }

src/main/java/com/xjrsoft/module/oa/vo/NewsVo.java

@@ -60,4 +60,7 @@ public class NewsVo {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
+
 }