修改接口

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

@@ -82,10 +82,12 @@ public class NewsController {
         MPJLambdaWrapper<News> wrapper = MPJWrappers.<News>lambdaJoin()
                 .distinct()
                 .eq(ObjectUtil.isNotEmpty(dto.getType()) && dto.getType() > 0, News::getTypeId, dto.getType())
-                .eq(ObjectUtil.isNotEmpty(dto.getClassId()) && dto.getClassId() > 0, News::getClassId, dto.getClassId())
+                .and(wq->wq.eq(News::getLevel,1).or().eq(News::getLevel,2).eq(News::getClassId, dto.getClassId()))
+                .eq(ObjectUtil.isNotEmpty(dto.getLevel()) && dto.getLevel() > 0, News::getLevel, dto.getLevel())
+                .and(wq->wq.eq(News::getSendRange,1).or().eq(News::getSendRange,2).in(News::getId,"select id from xjr_oa_news_relation where news_id=t.id and user_id="+StpUtil.getLoginIdAsLong()))
                 .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)
+//                .leftJoin(NewsRelation.class, onWrapper -> onWrapper.eq(NewsRelation::getNewsId, News::getId).eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()))
+//                .selectAs(NewsRelation::getId, NewsPageVo::getReadId)
                 .selectAs(News::getId, NewsPageVo::getId)
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()));
         IPage<NewsPageVo> page = newsService.selectJoinListPage(ConventPage.getPage(dto), NewsPageVo.class, wrapper);

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

@@ -175,6 +175,11 @@ public class AddNewsDto {
      */
     @ApiModelProperty("级别 1=校级 2=班级")
     private Integer level;
+    /**
+     * 发送范围 1=所有人 2=根据权限
+     */
+    @ApiModelProperty("发送范围 1=所有人 2=根据权限")
+    private Integer sendRange;
 
     /**
      * 附件子表

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

@@ -22,4 +22,7 @@ public class NewsPageDto extends PageInput {
 
     @ApiModelProperty("班级(base_class)")
     private Long classId;
+
+    @ApiModelProperty("级别 1=校级 2=班级")
+    private Integer level;
 }

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

@@ -172,6 +172,11 @@ public class UpdateNewsDto {
      */
     @ApiModelProperty("级别 1=校级 2=班级")
     private Integer level;
+    /**
+     * 发送范围 1=所有人 2=根据权限
+     */
+    @ApiModelProperty("发送范围 1=所有人 2=根据权限")
+    private Integer sendRange;
 
     /**
      * 附件子表

src/main/java/com/xjrsoft/module/oa/entity/News.java

@@ -113,6 +113,9 @@ public class News extends AuditEntity implements Serializable {
     @ApiModelProperty("级别 1=校级 2=班级")
     private Integer level;
 
+    @ApiModelProperty("发送范围 1=所有人 2=根据权限")
+    private Integer sendRange;
+
     /**
      * 附件子表
      */

src/main/resources/sqlScript/init_sql.sql

@@ -14,6 +14,7 @@ ALTER TABLE xjr_oa_news ADD COLUMN `open_reply` int NULL DEFAULT NULL COMMENT '
 ALTER TABLE xjr_oa_news ADD COLUMN `open_forward` int NULL DEFAULT NULL COMMENT '是否允许接收人转发 0=不能转发 1=允许转发';
 ALTER TABLE xjr_oa_news ADD COLUMN `open_view_other` int NULL DEFAULT NULL COMMENT '是否允许接收人查看其他接收人 0=不允许查看 1=允许查看';
 ALTER TABLE xjr_oa_news ADD COLUMN `level` int NULL DEFAULT NULL COMMENT '级别 1=校级 2=班级';
+ALTER TABLE xjr_oa_news ADD COLUMN `send_range` int NULL DEFAULT NULL COMMENT '发送范围 1=所有人 2=根据权限';
 
 -- 新闻关联
 ALTER TABLE xjr_oa_news_relation ADD COLUMN `read_mark` int NULL DEFAULT NULL COMMENT '阅读标记  0=未读 1=已读';