Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

 src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml

@@ -15,10 +15,22 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <!--自定义分页查询-->
    <select id="selectCategoryPage" resultMap="categoryResultMap">
        select * from jczz_category where is_deleted = 0
    </select>

    <!--天地图poi 分类获取-->
    <select id="getCategory" resultType="org.springblade.modules.category.vo.CategoryVO">
        select * from jczz_category
        where is_deleted = 0
        <if test="category.level!=null">
            and level = #{category.level}
        </if>
        <if test="category.parentNo!=null and category.parentNo!=''">
            and parent_no = #{category.parentNo}
        </if>
    </select>


</mapper>