修改查询角色栏接口

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({

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

signin/src/main/resources/application.yml

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