From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
index b28bcaa..0362b38 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -4,34 +4,49 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.message.MessageColumnSet">
- <id column="id" property="id" />
- <result column="user_id" property="userId" />
- <result column="message_column_id" property="messageColumnId" />
- <result column="is_receive" property="isReceive" />
+ <id column="id" property="id"/>
+ <result column="user_id" property="userId"/>
+ <result column="message_column_id" property="messageColumnId"/>
+ <result column="is_receive" property="isReceive"/>
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, user_id, message_column_id, is_receive
+ id
+ , user_id, message_column_id, is_receive
</sql>
- <select id="selectColumnAndCount" resultType="com.ycl.vo.message.MessageColumnSetVO" >
+ <select id="selectColumn" resultType="com.ycl.vo.message.MessageColumnSetVO">
SELECT
- count(1) as messageNumber,
- t4.column_name AS columnName
+ t2.column_name AS columnName,
+ t2.id
FROM
`ums_message_column_set` t1
- LEFT JOIN ums_message_column_set t2 ON t1.message_column_id = t2.id
- LEFT JOIN ums_message_column t4 ON t2.message_column_id = t4.id
- LEFT JOIN ums_message t3 ON t2.id=t3.message_type
+ LEFT JOIN ums_message_column t2 ON t1.message_column_id = t2.id
+ LEFT JOIN ums_message t3 ON t2.id = t3.message_type
<where>
- t2.is_receive=1
+ t1.is_receive=1
<if test="userId !=null">
- and t1.user_id = #{userId}
+ and t1.user_id = #{userId}
</if>
</where>
- GROUP BY
- t4.column_name
+ GROUP BY t2.id
+ </select>
+
+ <select id="selectColumnCount" resultType="java.lang.Integer">
+ SELECT
+ COUNT(1) as count
+ FROM
+ `ums_message_column_set` t1
+ LEFT JOIN ums_message_column t2 ON t1.message_column_id = t2.id
+ LEFT JOIN ums_message t3 ON t2.id = t3.message_type
+ where
+ t1.user_id = #{userId}
+ and t3.target_to=#{userId}
+ AND t2.id=#{id}
+ AND t3.is_view=0
+ And t3.channel_code='01'
+ and t3.status=1
</select>
</mapper>
--
Gitblit v1.8.0