合并

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -293,13 +293,13 @@
   <select id="getMessageTotal" resultType="map">
     SELECT
         count( CASE WHEN model_type = 1 AND read_status = 0 THEN 1 ELSE NULL END ) AS messageTotal,
-        count( CASE WHEN model_type = 2 THEN 1 ELSE NULL END ) AS toDoTotal
+        count( CASE WHEN model_type = 2 AND status = 1 THEN 1 ELSE NULL END ) AS toDoTotal
     FROM
         tp_message
     WHERE
         uuid_type = 1
         AND community_id = #{communityId,jdbcType=INTEGER}
-        AND (uuid = #{userId,jdbcType=INTEGER} or uuid = -1)
+        AND uuid = #{userId,jdbcType=INTEGER}
         AND STATUS = 1
         AND advice_type = 1
   </select>
@@ -343,7 +343,7 @@
     WHERE
         t.uuid_type = 1
         AND t.community_id = #{communityId,jdbcType=INTEGER}
-        AND (t.uuid = #{userId,jdbcType=INTEGER} or t.uuid= -1)
+        AND t.uuid = #{userId,jdbcType=INTEGER}
         AND t.STATUS = 1
         AND t.advice_type = 1
         AND t.uuid_type = 1