From 928f0dc1c112a4502ff9b8e60322aa8f2f918d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Thu, 1 Feb 2024 19:08:53 +0800
Subject: [PATCH] 123

---
 .../com/ruoyi/cai/dto/admin/vo/unread/UnreadData.java     | 2 ++
 .../main/java/com/ruoyi/cai/manager/UnreadManager.java    | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/unread/UnreadData.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/unread/UnreadData.java
index 5e27fd96..6ca82b75 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/unread/UnreadData.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/unread/UnreadData.java
@@ -11,4 +11,6 @@ public class UnreadData {
     private Long dynamicCount;
     private Long reportCount;
     private Long userGreetCount;
+
+    private Long userAvatarCount;
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UnreadManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UnreadManager.java
index df047456..5f061304 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UnreadManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UnreadManager.java
@@ -25,6 +25,8 @@ public class UnreadManager {
     private ReportService reportService;
     @Autowired
     private UserGreetService userGreetService;
+    @Autowired
+    private UserPictureAuditService userPictureAuditService;
 
     public UnreadData data() {
         UnreadData unreadData = new UnreadData();
@@ -42,6 +44,8 @@ public class UnreadManager {
         unreadData.setReportCount(reportCount);
         long userGreetCount = userGreetService.count(Wrappers.lambdaQuery(UserGreet.class).eq(UserGreet::getAuditStatus, AuditStatusEnum.AUDITING.getCode()));
         unreadData.setUserGreetCount(userGreetCount);
+        long userAvatarCount = userPictureAuditService.count(Wrappers.lambdaQuery(UserPictureAudit.class).eq(UserPictureAudit::getAuditStatus, AuditStatusEnum.AUDITING.getCode()));
+        unreadData.setUserGreetCount(userAvatarCount);
         return unreadData;
     }
 
@@ -75,6 +79,10 @@ public class UnreadManager {
         if(exists){
             return true;
         }
+        exists = userPictureAuditService.exists(Wrappers.lambdaQuery(UserPictureAudit.class).eq(UserPictureAudit::getAuditStatus, AuditStatusEnum.AUDITING.getCode()));
+        if(exists){
+            return true;
+        }
         return false;
     }
 }