Merge remote-tracking branch 'origin/dev' into dev

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

@@ -85,27 +85,6 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         News news = BeanUtil.toBean(addNewsDto, News.class);
         news.setEnabledMark(EnabledMark.ENABLED.getCode());
 
-        //是新闻
-        //如果张贴开始时间小于等于发布时间，表示是实时发布的新闻，状态应该是2
-        if(news.getTypeId().equals(1)
-                && ObjectUtil.isNotNull(news.getSendStartDate())
-                && ObjectUtil.isNotNull(news.getReleaseTime())
-                && news.getSendStartDate().compareTo(news.getReleaseTime()) >= 0){
-            news.setStatus(2);
-        }
-
-        //是公告
-        if(news.getTypeId().equals(2)){
-            //如果没有张贴时间，表示是移动端实时发布的公告，状态应该是2
-            if(ObjectUtil.isNull(news.getSendStartDate())){
-                news.setStatus(2);
-            }
-            //如果张贴开始时间小于等于发布时间，表示是实时发布的公告，状态应该是2
-            if(ObjectUtil.isNull(news.getReleaseTime())
-                    && news.getSendStartDate().compareTo(news.getReleaseTime()) >= 0){
-                news.setStatus(2);
-            }
-        }
 
         newsMapper.insert(news);
         //添加附件子表
@@ -116,6 +95,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 newsAppendixMapper.insert(newsAppendix);
             }
         }
+
         //公告需要添加阅读关系
         if (addNewsDto.getRelationList() != null) {
             for (AddNewsRelationDto relationDto : addNewsDto.getRelationList()) {

src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookClaimMapper.java

@@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface WfTextbookClaimMapper extends MPJBaseMapper<WfTextbookClaim> {
-    IPage<WfTextbookClaimPageVo> getPage(IPage<WfTextbookClaimPageDto> page, WfTextbookClaimPageDto dt0);
+    IPage<WfTextbookClaimPageVo> getPage(IPage<WfTextbookClaimPageDto> page, WfTextbookClaimPageDto dto);
 
     WfTextbookClaimVo infoDistribute(Long id);
 }