From 57d0e0a4dcebc397eb11739f4af1dcc2fe0e5af5 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 10 Sep 2021 16:21:37 +0800
Subject: [PATCH] =?UTF-8?q?20210910=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=A0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/common/service/IProRoleService.java     | 6 ++++++
 common/src/main/resources/mapper_dao/ProRoleDao.xml         | 2 +-
 signin/src/main/resources/application.yml                   | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/ccsens/common/service/IProRoleService.java b/common/src/main/java/com/ccsens/common/service/IProRoleService.java
index c30e3b72..d0ed1ab6 100644
--- a/common/src/main/java/com/ccsens/common/service/IProRoleService.java
+++ b/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);
 
     /**
diff --git a/common/src/main/resources/mapper_dao/ProRoleDao.xml b/common/src/main/resources/mapper_dao/ProRoleDao.xml
index 3d183f7d..3e23afb4 100644
--- a/common/src/main/resources/mapper_dao/ProRoleDao.xml
+++ b/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
diff --git a/signin/src/main/resources/application.yml b/signin/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/signin/src/main/resources/application.yml
+++ b/signin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common