Merge branch 'pre'

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

@@ -326,7 +326,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             xjrNews.setSendStartDate(LocalDateTime.now());
             xjrNews.setModifyUserId(StpUtil.getLoginIdAsLong());
             xjrNews.setModifyDate(LocalDateTime.now());
-            addRelation(xjrNews, null, 1);
+            //addRelation(xjrNews, null, 1);
         }
 
         if (xjrNews.getStatus() == 3) {

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环 io境 dev|pre|prod
   profiles:
-    active: pre
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

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

@@ -49,6 +49,7 @@
         NOW(),
         0
         from xjr_user t
+        inner join base_student t3 on t.id = t3.user_id
         left join base_student_school_roll t1 on t1.user_id = t.id
         LEFT JOIN base_class t2 ON t2.id = t1.class_id
         where t.delete_mark = 0