From c26e227abe288476c11b0a8b7875045e71efa14c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Thu, 30 Apr 2026 17:30:00 +0800
Subject: [PATCH] 新增修改

---
 multi-system/src/main/resources/mapper/system/MemoMapper.xml |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/multi-system/src/main/resources/mapper/system/MemoMapper.xml b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
index 377ccd2..4c2f091 100644
--- a/multi-system/src/main/resources/mapper/system/MemoMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/MemoMapper.xml
@@ -53,7 +53,40 @@
         a.id AS dataId
         FROM use_seal_apply a
         WHERE a.del_flag = 0
-        AND (a.apply_user_id = #{userId} or a.next_check = #{userId} )
+        AND (a.apply_user_id = #{userId} )
         AND a.`status` = 1 and a.company_id = #{companyId}
+        UNION ALL
+        SELECT a.use_seal_cause AS title,
+        '6' AS type,
+        a.id AS dataId
+        FROM use_seal_apply a
+        WHERE a.del_flag = 0
+        AND (a.next_check = #{userId} )
+        AND a.`status` = 1 and a.company_id = #{companyId}
+        UNION ALL
+        SELECT  concat(DATE(a.create_time),',您有新的颁布审批请查看手机端小程序!') as title,
+        '7' AS type,
+        a.id AS dataId
+        FROM proclaim a
+        WHERE a.del_flag = 0
+        AND a.check_id = #{userId}
+        AND a.`status` = 0 and a.company_id = #{companyId}
+        UNION ALL
+        SELECT
+        cl.contract_name AS title,
+        '8' AS type,
+        cr.id AS dataId
+        FROM
+        contract_review cr
+        LEFT JOIN contract_ledger cl ON cr.contract_id = cl.id
+        WHERE
+        cr.del_flag = 1 and cr.status = 0
+        AND (
+        EXISTS ( SELECT 1 FROM contract_review_mess crm WHERE crm.review_id = cr.id AND crm.STATUS = 0 AND crm.review_user = #{userId} )
+        OR (
+        NOT EXISTS ( SELECT 1 FROM contract_review_mess crm WHERE crm.review_id = cr.id AND crm.STATUS = 0 )
+        AND cr.legal_person = #{userId}
+        )
+        )
     </select>
 </mapper>

--
Gitblit v1.9.2