办事指南调整

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

@@ -184,7 +184,7 @@ public class NewsController {
                                 .selectAs(File::getFileUrl, NewsAppendixVo::getFileUrl))
         );
 
-        if (newsAppendixVoList.size() > 0) {
+        if (!newsAppendixVoList.isEmpty()) {
             newsVo.setAppendixList(newsAppendixVoList);
         }
 

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

@@ -202,4 +202,7 @@ public class AddNewsDto {
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "newsId")
     private List<AddNewsRelationDto> relationList;
+
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
 }

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

@@ -132,4 +132,7 @@ public class News extends AuditEntity implements Serializable {
 
     @ApiModelProperty("创建人id")
     private Long createUserId;
+
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
 }

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

@@ -510,6 +510,10 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
         News news = BeanUtil.toBean(addNewsDto, News.class);
         news.setEnabledMark(EnabledMark.ENABLED.getCode());
+        if(news.getTypeId() != null && news.getTypeId() == 3){
+            news.setWfStatus(1);
+            news.setStatus(2);
+        }
 
         newsMapper.insert(news);
         //添加附件子表
@@ -525,7 +529,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         //1=全校教职工,添加全校教职工到关系表
         addRelation(news, BeanUtil.toBean(addNewsDto, AddProclamationDto.class), 1);
         //添加新闻和公告的时候，如果状态是2，表示新闻和公告实时发布了，张贴开始时间就应该是发布时间需要发送消息
-        if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2) {
+        if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2 && addNewsDto.getTypeId() != 3) {
             SendMessage(news.getId());
         }