20210721

common/src/main/java/com/ccsens/common/api/RoleController.java

@@ -32,15 +32,15 @@ public class RoleController {
     @Resource
     private IProRoleService proRoleService;
 
-    //@MustLogin
+    @MustLogin
     @ApiOperation(value = "查询角色栏展示的角色",notes = "")
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/QueryRoleShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<RoleVo.QueryRole> queryByProjectVirtualRole(
-                                                          @ApiParam @Validated @RequestBody QueryDto<RoleDto.QueryRole> params) throws Exception {
+                                                          @ApiParam @Validated @RequestBody QueryDto<RoleDto.QueryRoleById> params) throws Exception {
         log.info("查询角色栏展示的角色：{}",params);
-        params.setUserId(1373938255183089664L);
+//        params.setUserId(1373938255183089664L);
         RoleVo.QueryRole list = proRoleService.QueryShowRole(params.getParam(),params.getUserId());
         log.info("查询角色栏展示的角色成功");
         return JsonResponse.newInstance().ok(list);

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

@@ -5,7 +5,7 @@ import com.ccsens.common.bean.vo.RoleVo;
 
 public interface IProRoleService {
 
-    RoleVo.QueryRole QueryShowRole(RoleDto.QueryRole param, Long userId);
+    RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId);
 
     void updateShowRole(RoleDto.UpdateRoleShow param, Long userId);
 }

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

@@ -48,7 +48,7 @@ public class ProRoleService implements IProRoleService {
 
 
     @Override
-    public RoleVo.QueryRole QueryShowRole(RoleDto.QueryRole param, Long userId) {
+    public RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId) {
         RoleVo.QueryRole role = new RoleVo.QueryRole();
         //角色显示的角色
         List<RoleVo.RoleInfo> visibleList = new ArrayList<>();