新闻消息数量调整

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -64,7 +64,7 @@ public class ConcatController {
                 " AND t3.role_id = 2";
         if(dto.getDeptId() != null){
             sql += " AND t5.hierarchy LIKE '%" + dto.getDeptId() + "%'";
-        }else{
+        }else if(!StrUtil.isNotEmpty(dto.getName())){
             sql += " AND t5.id = " + parentId;
         }
         if(StrUtil.isNotEmpty(dto.getName())){

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

@@ -379,7 +379,6 @@ public class NewsController {
                         MPJWrappers.<News>lambdaJoin()
                                 .leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
                                 .eq(News::getStatus, 2)
-                                .gt(News::getSendEndDate, LocalDateTime.now())
                                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(News::getTypeId, typeId)
                                 .eq(NewsRelation::getReadMark, 0)