From 443a9510ba9c032d83139048f73201706a1d9c45 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
index eb7bff6..7572a05 100644
--- a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
+++ b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
@@ -31,7 +31,8 @@
@Override
public IPage<InformationNotificationDto> getPage(Page page, String messageType) {
- return baseMapper.getPage(page, messageType);
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ return baseMapper.getPage(page, messageType, map1.get("userId"));
}
@Override
@@ -50,13 +51,18 @@
@Override
public Boolean checkForUnreadData() {
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
- List<InformationNotification> informationNotifications = baseMapper.selectList(
- Wrappers.<InformationNotification>lambdaQuery()
- .eq(InformationNotification::getConsigneeId, map1.get("userId"))
- .eq(InformationNotification::getViewStatus, false)
- .last("limit 1"));
- return !informationNotifications.isEmpty();
+ Map<String, Integer> map1 = null;
+ try {
+ map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ List<InformationNotification> informationNotifications = baseMapper.selectList(
+ Wrappers.<InformationNotification>lambdaQuery()
+ .eq(InformationNotification::getConsigneeId, map1.get("userId"))
+ .eq(InformationNotification::getViewStatus, false)
+ .last("limit 1"));
+ return !informationNotifications.isEmpty();
+ } catch (Exception e) {
+ }
+ return false;
}
@Override
--
Gitblit v1.9.3