Merge remote-tracking branch 'origin/master'

zhongrj

2024-11-25 a09e361bfcb68a809e9143eca87bed2d66af2216

 src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml

@@ -21,10 +21,16 @@

    <!--自定义分页查询-->
    <select id="selectPanoramicPage" resultType="org.springblade.modules.yw.vo.PanoramicVO">
        select * from yw_panoramic where is_deleted = 0
        <if test="panoramic.firmId!=null">
            and firm_id = #{panoramic.firmId}
        </if>
        select * from yw_panoramic
        <where>
            is_deleted = 0
            <if test="panoramic.firmId!=null">
                and firm_id = #{panoramic.firmId}
            </if>
            <if test="panoramic.remark!=null and panoramic.remark!=''">
                and remark = #{panoramic.remark}
            </if>
        </where>
    </select>

</mapper>