From 4a5d811bd3c3f109df869f2e79c736776e7caf24 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 8 Sep 2021 15:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=A0=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/common/src/main/java/com/ccsens/common/api/RoleController.java b/common/src/main/java/com/ccsens/common/api/RoleController.java
index b619fd73..f5a397a6 100644
--- a/common/src/main/java/com/ccsens/common/api/RoleController.java
+++ b/common/src/main/java/com/ccsens/common/api/RoleController.java
@@ -1,8 +1,8 @@
 //package com.ccsens.common.api;
 //
 //import com.ccsens.cloudutil.annotation.MustLogin;
-//import com.ccsens.common.bean.dto.RoleDto;
-//import com.ccsens.common.bean.vo.RoleVo;
+//import com.ccsens.common.bean.dto.CRoleDto;
+//import com.ccsens.common.bean.vo.CRoleVo;
 //import com.ccsens.common.service.IProRoleService;
 //import com.ccsens.util.JsonResponse;
 //import com.ccsens.util.WebConstant;
@@ -37,15 +37,15 @@
 //    @ApiImplicitParams({
 //    })
 //    @RequestMapping(value = "/QueryRoleShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-//    public JsonResponse<RoleVo.QueryRole> queryByProjectVirtualRole(
-//                                                          @ApiParam @Validated @RequestBody QueryDto<RoleDto.QueryRoleById> params) throws Exception {
+//    public JsonResponse<CRoleVo.QueryRole> queryByProjectVirtualRole(
+//                                                          @ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryRoleById> params) throws Exception {
 //        log.info("查询角色栏展示的角色：{}",params);
-//        RoleVo.QueryRole list = proRoleService.QueryShowRole(params.getParam(),params.getUserId());
+//        CRoleVo.QueryRole list = proRoleService.queryShowRole(params.getParam(),params.getUserId());
 //        log.info("查询角色栏展示的角色成功");
 //        return JsonResponse.newInstance().ok(list);
 //    }
 //
-//
+
 //    @MustLogin
 //    @ApiOperation(value = "配置角色栏展示的角色",notes = "")
 //    @ApiImplicitParams({
diff --git a/common/src/main/resources/mapper_dao/ProRoleDao.xml b/common/src/main/resources/mapper_dao/ProRoleDao.xml
index 678c1680..d6d9ae02 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
     </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 e75cc2c3..b5408a3a 100644
--- a/signin/src/main/resources/application.yml
+++ b/signin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common