新闻公告调整

src/main/java/com/xjrsoft/module/oa/mapper/NewsRelationMapper.java

@@ -36,4 +36,6 @@ public interface NewsRelationMapper extends MPJBaseMapper<NewsRelation> {
      * @return
      */
     Boolean insertPersonl(@Param("newsId") Long newsId, @Param("userIdList")List<Long> userIdList);
+
+    Boolean insertAllUser(@Param("newsId") Long newsId);
 }

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

@@ -513,8 +513,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         else if (xjrNews.getSendRange() == 2) {
             newsRelationMapper.insertAllTeaStaff(xjrNews.getId());
         }else if (xjrNews.getSendRange() == 1) {
-            newsRelationMapper.insertClassUser(xjrNews.getId(), null);
-            newsRelationMapper.insertDeptUser(xjrNews.getId(), null);
+            newsRelationMapper.insertAllUser(xjrNews.getId());
         }
         return true;
     }

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

@@ -81,4 +81,16 @@
         </if>)
     </insert>
 
+    <insert id="insertAlluser" parameterType="java.lang.Long">
+        insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
+            (select
+                 UUID(),
+                 #{newsId},
+                 t.id,
+                 NOW(),
+                 0
+             from xjr_user t
+             where t.delete_mark = 0)
+    </insert>
+
 </mapper>