From d40a69e7d455c12e32201330a9fbe22a7b6b4b5d Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 14:44:45 +0800
Subject: [PATCH] fix: 获取部门树为启用的

---
 ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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..e44e466 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -17,15 +17,20 @@
 
     <select id="selectColumnAndCount" resultType="com.ycl.vo.message.MessageColumnSetVO" >
         SELECT
-            COUNT( 1 ) AS messageNumber,
-            t2.column_name As columnName
+        count( 1 ) AS messageNumber,
+        t2.column_name AS columnName
         FROM
-            `ums_message_column_set` t1
-                LEFT JOIN ums_message_column t2 ON t1.message_column_id = t2.id
-        WHERE
-            t1.user_id = #{userId}
+        `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.column_name
+        t2.column_name
     </select>
 
 </mapper>

--
Gitblit v1.8.0