From bd8147d7890bf60d88e4007c1af726ba5f364cf5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 14 三月 2023 11:24:31 +0800
Subject: [PATCH] 拼接地址

---
 ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml |   45 +++++++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
index d47078c..0362b38 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -4,28 +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,
-            t2.column_name As columnName
+        t2.column_name AS columnName,
+        t2.id
+        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.is_receive=1
+            <if test="userId !=null">
+                and t1.user_id = #{userId}
+            </if>
+        </where>
+        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
-        WHERE
+            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}
-        GROUP BY
-            t2.column_name
+          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