1、排课基础数据推送

2、系统消息查询调整

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

@@ -436,16 +436,24 @@ public class NewsController {
                 newsCountTypeVo.setTitle(news.getFullHead());
             }
             if(typeId == 4){
-                long count = systemUpdateMessageService.count(
+                List<SystemUpdateMessage> list = systemUpdateMessageService.list(
                         MPJWrappers.<SystemUpdateMessage>lambdaJoin()
+                                .distinct()
                                 .leftJoin(SystemUpdateMessageNotice.class, SystemUpdateMessageNotice::getSystemUpdateMessageId, SystemUpdateMessage::getId)
                                 .eq(SystemUpdateMessageNotice::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(SystemUpdateMessage::getDeleteMark, DeleteMark.NODELETE.getCode())
                                 .eq(SystemUpdateMessage::getStatus, 1)
                                 .eq(SystemUpdateMessageNotice::getStatus, 0)
+                                .orderByDesc(SystemUpdateMessage::getReleaseDate)
                 );
-                newsCountTypeVo.setTypeId(typeId);
-                newsCountTypeVo.setTotal(count);
+                if(list.isEmpty()){
+                    newsCountTypeVo.setTypeId(typeId);
+                    newsCountTypeVo.setTotal(list.stream().count());
+                    SystemUpdateMessage message = list.get(0);
+                    newsCountTypeVo.setTitle(message.getTitle());
+                    newsCountTypeVo.setTime(message.getReleaseDate());
+                }
+
             }
             newsCountTypeVoList.add(newsCountTypeVo);
         }

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -333,6 +333,9 @@ public class DataUtil {
                 continue;
             }
             JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
+            if(StrUtil.isEmpty(resultJson.get("data").getAsString())){
+                continue;
+            }
             idMap.put(courseSubject.getId().toString(), resultJson.get("data").getAsString());
         }
         //插入记录表

src/main/java/com/xjrsoft/module/system/controller/SystemUpdateMessageController.java

@@ -161,6 +161,7 @@ public class SystemUpdateMessageController {
             .eq(SystemUpdateMessageNotice::getUserId, StpUtil.getLoginIdAsLong())
             .eq(SystemUpdateMessage::getDeleteMark, DeleteMark.NODELETE.getCode())
             .eq(SystemUpdateMessage::getStatus, 1)
+            .orderByDesc(SystemUpdateMessage::getReleaseDate)
         );
         PageOutput<SystemUpdateMessagePageVo> pageOutput = ConventPage.getPageOutput(page, SystemUpdateMessagePageVo.class);
         return RT.ok(pageOutput);