lin
2024-04-16 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467
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>
@@ -202,7 +202,8 @@
        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},'%')
@@ -237,6 +238,8 @@
        jh.building,
        jh.house_name,
        jh.district_name,
        jut.create_time,
        jh.area,
        (
        SELECT
        group_concat( jt.id ) AS optionContent