From c29e0d624eaceb5d7db1bd078a9b9b4a72d7ef49 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 17:42:51 +0800
Subject: [PATCH] fix(supplier): 修复供应商白名单查询条件判断

---
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 8f2216b..d6504a1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -24,7 +24,18 @@
 
     @Override
     public IPage<NoticeDTO> listPage(Page page, NoticeDTO noticeDTO) {
-        return noticeMapper.listPage(page, noticeDTO);
+        IPage<NoticeDTO> noticeDTOIPage = noticeMapper.listPage(page, noticeDTO);
+        noticeDTOIPage.getRecords().forEach(item -> {
+            // 鏍规嵁杩囨湡鏃堕棿鍒ゆ柇statusName
+            if (item.getExpirationDate() == null) {
+                item.setStatusName("鏈煡");
+            }else if(item.getExpirationDate().getTime() < System.currentTimeMillis()){
+                item.setStatusName("宸茶繃鏈�");
+            } else{
+                item.setStatusName("姝e父");
+            }
+        });
+        return noticeDTOIPage;
     }
 
     @Override

--
Gitblit v1.9.3