and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') )
<!-- and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') )-->
</if>
<!-- </if>-->
</where>
</where>
ORDER BY CONVERT(panel_group.name using gbk)
ORDER BY CONVERT(panel_group.name using gbk)
</select>
</select>
...
@@ -170,9 +170,9 @@
...
@@ -170,9 +170,9 @@
<iftest="level != null">
<iftest="level != null">
and panel_group.level = #{level}
and panel_group.level = #{level}
</if>
</if>
<iftest="isAdmin != null and !isAdmin">
<!-- <if test="isAdmin != null and !isAdmin">-->
and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') )
<!-- and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') )-->
</if>
<!-- </if>-->
</where>
</where>
ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk)
ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk)