Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

 src/main/resources/mapper/ColumnMapper.xml

@@ -51,4 +51,23 @@
            </foreach>
        </if>
    </select>


    <select id="selectWebColumnInListByParentId" resultType="com.xcong.farmer.cms.modules.system.vo.WebColumnVo">
        SELECT
            a.*
        FROM
            t_column a
        where a.parent_id = #{parentId} and a.company_id = #{companyId}
        order by a.order_num ASC,a.create_time desc
    </select>

    <select id="selectColumnIdsByParentId" resultType="java.lang.Long">
        select
            a.id
        FROM
            t_column a
        where a.parent_id = #{parentId} and a.company_id = #{companyId}
        order by a.id desc
    </select>
</mapper>