Merge branch 'pre'

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

@@ -147,6 +147,9 @@ public class NewsController {
         if (news == null) {
             return RT.error("该内容不存在或已被删除！");
         }
+        if (EnabledMark.DISABLED.getCode() == news.getEnabledMark()) {
+            return RT.error("该内容已被作废！");
+        }
 
         List<NewsRelationVo> newsRelationVoList = new ArrayList<>();
         MPJLambdaWrapper<NewsRelation> queryWrapper = new MPJLambdaWrapper<>();