From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 171bc4e..8e4dcfd 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -203,7 +203,7 @@
         LEFT JOIN jczz_house jhs on jhs.house_code= jda.address_code
         <where>
             and jt.discuss_content != '议事规则'
-            and jt.discuss_content != '管理公约'
+            and jt.discuss_content != '管理规约'
             <if test="id != null ">and jut.id = #{id}</if>
             <if test="name != null and name != ''">
                 and bu.name like concat('%',#{name},'%')
@@ -243,11 +243,9 @@
         (
         SELECT
         group_concat( jt.id ) AS optionContent
-        FROM
-        jczz_user_topics jut
-        LEFT JOIN jczz_topics jt ON jt.id = jut.topics_id
-        WHERE
-        jut.house_code = jh.house_code
+        FROM jczz_topics jt
+        WHERE  jt.id = jut.topics_id
+        and jut.house_code = jh.house_code
         AND jut.article_id = #{articleId}
         ) optionContent,
         (SELECT jhd.name from jczz_household jhd where  jhd.house_code = jh.house_code AND jhd.is_deleted = 0 and jhd.relationship = 1 limit 1 ) name,
@@ -256,7 +254,7 @@
         jczz_house jh
         LEFT JOIN jczz_household jhd ON jhd.house_code = jh.house_code
         AND jh.is_deleted = 0 and jhd.relationship = 1
-        LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id
+        LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id AND jut.article_id = #{articleId}
         <where>
             <if test="aoiCodeList != null and aoiCodeList.size() > 0">
                 and jh.district_code in

--
Gitblit v1.9.3