From f59171b5dfca28b0b9761210190be0ca14aa3418 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Fri, 25 Apr 2025 14:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/busi/BusiNoticeMapper.xml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
index 01fb83d..e4152df 100644
--- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
@@ -299,9 +299,9 @@ order by dbns.create_time desc
             count(sign.id) as reportNum,
             mySign.create_time as signTime,
         CASE
-        WHEN mySign.status = '0' AND dbn.end_date &gt;= CURDATE() THEN '审核中'
-        WHEN mySign.status = '1' THEN '已通过'
-        WHEN mySign.status = '0' AND dbn.end_date &lt; CURDATE() THEN '未合作'
+        WHEN mySign.status = '01' AND dbn.end_date &gt;= CURDATE() THEN '审核中'
+        WHEN mySign.status = '02' THEN '已通过'
+        WHEN mySign.status = '01' AND dbn.end_date &lt; CURDATE() THEN '未合作'
         ELSE '已过期'
         END AS signStatus
         FROM
@@ -309,20 +309,20 @@ order by dbns.create_time desc
             LEFT JOIN dl_busi_notice_view dbnv ON dbn.id = dbnv.id
             LEFT JOIN sys_user su ON dbn.user_id = su.user_id
             LEFT join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0
-            inner join dl_busi_notice_sign mySign on sign.notice_id = dbn.id and sign.del_flag = 0 and sign.user_id = #{entity.userId}
+            inner join dl_busi_notice_sign mySign on dbn.id = mySign.notice_id and dbn.del_flag = 0 and mySign.user_id = #{entity.userId}
         WHERE
             dbn.del_flag = 0
           AND (dbn.approval_status = '1')
         <if test="entity.reportStatus!=null and entity.reportStatus!=''  ">
             <choose>
                 <when test="entity.reportStatus=='审核中'">
-                  and  mySign.status ='0'  and dbn.end_date &gt;= CURDATE()
+                  and  mySign.status ='01'  and dbn.end_date &gt;= CURDATE()
                 </when>
                 <when test="entity.reportStatus=='已通过'">
-                  and  mySign.status ='1'
+                  and  mySign.status ='02'
                 </when>
                 <when test="entity.reportStatus=='未合作'">
-                  and mySign.status ='0' and dbn.end_date &lt; CURDATE()
+                  and mySign.status ='01' and dbn.end_date &lt; CURDATE()
                 </when>
 
             </choose>