住户删除不能排除

lin

2024-04-17 2af148a7b15f1273d12be7b910bc6d9e4e41d2c2

 src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml

@@ -111,7 +111,7 @@
        jda.address_name,
        jhs.area,
        jhs.remark,
        jda.houseCode,
        jda.address_code houseCode,
        jda.aoi_name
        <if test="articleId != null ">,
            group_concat(jt.option_content) optionContent  </if>
@@ -153,7 +153,7 @@
                jda.address_name,
                jhs.area,
                jhs.remark,
                jda.houseCode,
                jda.address_code,
                jda.aoi_name
            </if>
        </where>
@@ -196,13 +196,14 @@
        jhs.district_name
        FROM
        jczz_user_topics as jut
        LEFT JOIN jczz_household jh ON jh.id = jut.household_id and jh.is_deleted = 0
        LEFT JOIN jczz_household jh ON jh.id = jut.household_id
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
        LEFT JOIN jczz_topics jt on jt.id = jut.topics_id
        LEFT JOIN blade_user bu ON jh.associated_user_id = bu.id AND bu.is_deleted = 0
        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},'%')
@@ -232,11 +233,13 @@
    </select>
    <select id="getHouseholdList" resultType="org.springblade.modules.discuss.excel.holdExcel">
        SELECT
        DISTINCT(jh.id),
        jh.id,
        jh.room,
        jh.building,
        jh.house_name,
        jh.district_name,
        jut.create_time,
        jh.area,
        (
        SELECT
        group_concat( jt.id ) AS optionContent
@@ -252,7 +255,7 @@
        FROM
        jczz_house jh
        LEFT JOIN jczz_household jhd ON jhd.house_code = jh.house_code
        AND jh.is_deleted = 0
        AND jh.is_deleted = 0 and jhd.relationship = 1
        LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id
        <where>
            <if test="aoiCodeList != null and aoiCodeList.size() > 0">
@@ -262,6 +265,7 @@
                </foreach>
            </if>
        </where>
        GROUP BY id
    </select>