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

xiaoyong931011

2022-06-24 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813

 src/main/resources/mapper/NavigationBarMapper.xml

@@ -12,8 +12,8 @@
                <if test="record.parentId != null">
                    and a.parent_id = #{record.parentId}
                </if>
                <if test="record.belongId != null">
                    and a.belong_id = #{record.belongId}
                <if test="record.companyId != null">
                    and a.company_id = #{record.companyId}
                </if>
            </if>
        </where>
@@ -26,7 +26,7 @@
        FROM
        t_navigation_bar a
        where a.parent_id = #{parentId}
          and a.belong_id = #{belongId}
          and a.company_id = #{belongId}
        order by a.create_time desc
    </select>

@@ -36,7 +36,7 @@
        FROM
            t_navigation_bar a
        where a.parent_id = #{parentId}
          and a.belong_id = #{belongId}
          and a.company_id = #{belongId}
        order by a.create_time desc
    </select>