From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复;

---
 framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 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..68ba7ef 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
@@ -3,15 +3,15 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.pojo.InformationNotification;
 import com.yuanchu.mom.mapper.InformationNotificationMapper;
+import com.yuanchu.mom.pojo.InformationNotification;
 import com.yuanchu.mom.pojo.InformationNotificationDto;
 import com.yuanchu.mom.service.InformationNotificationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -26,12 +26,13 @@
 @Service
 public class InformationNotificationServiceImpl extends ServiceImpl<InformationNotificationMapper, InformationNotification> implements InformationNotificationService {
 
-    @Autowired
+    @Resource
     private GetLook getLook;
 
     @Override
     public IPage<InformationNotificationDto> getPage(Page page, String messageType) {
-        return baseMapper.getPage(page, messageType);
+        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+        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
@@ -65,4 +71,9 @@
                 .eq(InformationNotification::getId, id)
                 .set(InformationNotification::getViewStatus, true));
     }
+
+    @Override
+    public int addInformationNotification(InformationNotification informationNotification) {
+        return baseMapper.insert(informationNotification);
+    }
 }

--
Gitblit v1.9.3