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/system/controller/MenuController.java

@@ -171,6 +171,7 @@ public class MenuController {
     @GetMapping("/simple-tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
     public R menuAuthTree(@Valid MenuTreeDto dto) {
+        dto.setDisplay(null);
         List<MenuVo> list = menuService.getAuthMenuList(dto);
         List<MenuSimpleTreeVo> voList = BeanUtil.copyToList(list, MenuSimpleTreeVo.class);
         List<MenuSimpleTreeVo> treeVoList = TreeUtil.build(voList);

src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -30,4 +30,7 @@ public class MenuTreeDto {
     private String code;
 
     private Integer enabledMark;
+
+    // 菜单是否显示 0=隐藏 1=显示
+    private Integer display = 1;
 }

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -167,7 +167,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                         .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
                         .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
                         .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
-                        .eq(Menu::getDisplay, 1) // 只查询显示菜单
+                        .eq(ObjectUtil.isNotEmpty(dto.getDisplay()),Menu::getDisplay, dto.getDisplay())
                         .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
                         .select(Menu::getId)
                         .selectAs(Subsystem::getName, MenuVo::getSystemName)

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);
 }