From dcfaf0d7c20aec3ae32c14ce65a5584689398640 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:09 +0800
Subject: [PATCH] 部分代码逻辑优化

---
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
index 1cdd838..0592318 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -1,8 +1,6 @@
 package com.ruoyi.collaborativeApproval.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ruoyi.collaborativeApproval.dto.NoticeDTO;
@@ -16,6 +14,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -42,12 +42,23 @@
 
     @Override
     public List<NoticeDTO> selectCount() {
-        List<Notice> notices = noticeMapper.selectList(Wrappers.lambdaQuery(Notice.class).groupBy(Notice::getType));
+        List<Notice> noticesList = noticeMapper.selectList(null);
+        Map<String, Notice> uniqueByType = noticesList.stream()
+                .collect(Collectors.toMap(
+                        Notice::getType,
+                        n -> n,
+                        (existing, replacement) -> existing
+                ));
+
+        List<Notice> notices = new ArrayList<>(uniqueByType.values());
+        Map<String, Long> countMap = noticesList.stream().collect(Collectors.groupingBy(Notice::getType, Collectors.counting()));
         List<NoticeDTO> result = new ArrayList<>();
         for (Notice notice : notices) {
             NoticeDTO notice1 = new NoticeDTO();
             BeanUtils.copyProperties(notice, notice1);
-            notice1.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, notice.getType())));
+            if (countMap.containsKey(notice.getType())) {
+                notice1.setCount(countMap.get(notice.getType()) == null ? 0 : countMap.get(notice.getType()));
+            }
             result.add(notice1);
         }
         return result;

--
Gitblit v1.9.3