From f7d45da70da6d02fa476d97d2a9fec187de5881d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 10:46:33 +0800
Subject: [PATCH] art: 技术状态鉴定工单-流程问题修改

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 532dd8f..da34614 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -60,9 +60,13 @@
 		<if test="announcementSendModel.bizSource !=null and announcementSendModel.bizSource =='isNoBpm'">
 			and (sa.bus_type != 'bpm' or sa.bus_type is null)
 		</if>
-        <if test="announcementSendModel.msgCategory !=null and announcementSendModel.msgCategory != ''">
-            and sa.msg_category = #{announcementSendModel.msgCategory}
-        </if>
+		<if test="announcementSendModel.msgCategoryList.size != 0">
+			and sa.msg_category in (
+			<foreach item="msgCategory" collection="announcementSendModel.msgCategoryList" separator=",">
+				#{msgCategory}
+			</foreach>
+			)
+		</if>
 	   order by sas.read_flag,sa.send_time desc
 	</select>
 
@@ -125,4 +129,14 @@
 			</if>
 	</select>
 
+    <select id="findLastMessage" resultType="org.jeecg.modules.system.entity.SysAnnouncement">
+		SELECT TOP 1 * FROM sys_announcement WHERE msg_content = #{messageContent} ORDER BY create_time DESC;
+	</select>
+	<select id="getMessageType" resultType="java.lang.String">
+		SELECT DISTINCT
+			msg_category
+		FROM
+			sys_announcement
+	</select>
+
 </mapper>

--
Gitblit v1.9.3