新闻模块调整

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

@@ -42,4 +42,7 @@ public class NewsPageDto extends PageInput {
     @ApiModelProperty("是否已读(2:是 0:否)")
     private Integer readMark;
 
+    @ApiModelProperty(value = "当前角色id", hidden = true)
+    private Long loginRoleId;
+
 }

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -556,6 +556,10 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     @Override
     public IPage<NewsPageVo> receiptBox(NewsPageDto dto) {
         dto.setLoginId(StpUtil.getLoginIdAsLong());
+        if(StpUtil.getRoleList().contains("4")){
+            dto.setLoginRoleId(4L);
+        }
+
         IPage<NewsPageVo> page = newsMapper.receiptBox(ConventPage.getPage(dto), dto);
         return page;
     }

src/main/resources/mapper/oa/NewsMapper.xml

@@ -60,6 +60,9 @@
             and (t.full_head LIKE CONCAT('%',#{dto.keyword},'%')
                 or t.news_content LIKE CONCAT('%',#{dto.keyword},'%'))
         </if>
+        <if test="dto.loginId != null and dto.loginRoleId != null and dto.loginRoleId == 4">
+            and t3.user_id = #{dto.loginId}
+        </if>
         <if test="dto.loginId != null and dto.readMark != null">
             and t3.read_mark =  #{dto.readMark}
         </if>