修复用户角色返回role及菜单增加排序

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -79,6 +79,7 @@
                 and a.PARENT_MENU_ID = #{parentMenuId}
             </if>
         </where>
+        order by a.seq
     </select>
     <!--  根据获取实体List   -->
     <select id="findUserFirstMenu" resultType="com.huaxu.entity.MenuEntity">
@@ -93,6 +94,7 @@
                 and userrole.user_id = #{userId}
             </if>
         </where>
+        order by a.seq
     </select>
     <!--  根据获取实体List   -->
     <select id="findUserMenu" resultType="com.huaxu.entity.MenuEntity">
@@ -110,6 +112,7 @@
                 and a.app_id = #{appId}
             </if>
         </where>
+        order by a.seq
     </select>
 
     <!--  根据获取实体 page   -->

user_center/src/main/resources/mapper/UserMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          a.update_by as "updateBy",
          com.org_name as "companyOrgName" ,
          dep.org_name as "deptOrgName",
-         userrole.id as roleId,
+         userrole.ROLE_ID as roleId,
          role.role_name as "roleName"
      </sql>
     <!-- 外联表  -->