20210910查询角色排序加id

common/src/main/java/com/ccsens/common/service/IProRoleService.java

@@ -9,6 +9,12 @@ public interface IProRoleService {
 
     void updateShowRole(CRoleDto.UpdateRoleShow param, Long userId);
 
+    /**
+     * 查询角色栏的角色信息
+     * @param param
+     * @param userId
+     * @return
+     */
     CRoleVo.QueryRole queryShowRole(CRoleDto.QueryRoleById param, Long userId);
 
     /**

common/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -166,7 +166,7 @@
         rr.id is null
         )
         GROUP BY r.id
-        ORDER BY pm DESC,mine DESC
+        ORDER BY pm DESC,mine DESC,r.id
     </select>
     <select id="attentionQueryRole" resultType="com.ccsens.common.bean.vo.CRoleVo$RoleInfo">
         SELECT

signin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common