Commit cef41355 authored by liqin's avatar liqin 💬

Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

parents 535fb75e e44de66e
...@@ -13,11 +13,14 @@ ...@@ -13,11 +13,14 @@
<result column="parent_id" property="parentId" /> <result column="parent_id" property="parentId" />
<result column="is_button" property="isButton" /> <result column="is_button" property="isButton" />
<result column="level" property="level" /> <result column="level" property="level" />
<result column="icon" property="icon" />
<result column="color" property="color" />
<result column="avatar" property="avatar" />
</resultMap> </resultMap>
<select id="getUserMenuPerms" resultMap="BaseResultMap"> <select id="getUserMenuPerms" resultMap="BaseResultMap">
SELECT distinct SELECT distinct
m.id,m.name,m.url,m.parent_id,m.sort,m.is_button,m.level m.id,m.name,m.url,m.parent_id,m.sort,m.is_button,m.level,m.icon,m.color,m.avatar
FROM FROM
ref_role_menu rm ref_role_menu rm
LEFT JOIN menu m ON m.id = rm.menu_id LEFT JOIN menu m ON m.id = rm.menu_id
...@@ -30,7 +33,7 @@ ...@@ -30,7 +33,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
ORDER BY m.level desc ORDER BY m.level desc,m.sort
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment