Merge remote-tracking branch 'origin/master'

linwe

2024-05-15 fe81eb39c7402082f54e6aaee491efbcbb1aa50a

 src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml

@@ -416,5 +416,22 @@

    </select>

    <!--查询对应的label集合信息-->
    <select id="getLabelList" resultType="org.springblade.modules.house.entity.UserHouseLabelEntity">
        SELECT id as label_id,label_name FROM jczz_label
        WHERE is_deleted = 0
        <choose>
            <when test="labelNames!=null and labelNames!=''">
                and label_name in
                <foreach collection="labelNames.split(',')" item="labelName" open="(" separator="," close=")">
                    #{labelName}
                </foreach>
            </when>
            <otherwise>
                and label_name = #{labelNames}
            </otherwise>
        </choose>
    </select>


</mapper>