From d148b272c978abdcf32303747ff552149c75fc63 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 24 Sep 2021 10:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/carbasics/api/RoleController.java  | 30 +++++++++++++++++++
 src/main/resources/application.yml            |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/RoleController.java b/src/main/java/com/ccsens/carbasics/api/RoleController.java
index 9fc6802..bebd2cb 100644
--- a/src/main/java/com/ccsens/carbasics/api/RoleController.java
+++ b/src/main/java/com/ccsens/carbasics/api/RoleController.java
@@ -1,5 +1,7 @@
 package com.ccsens.carbasics.api;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.common.bean.dto.CRoleDto;
 import com.ccsens.common.bean.vo.CRoleVo;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author 逗
@@ -35,6 +39,32 @@ public class RoleController {
         public JsonResponse<CRoleVo.QueryRole> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryRoleById> params) {
         params.getParam().setNum(0);
         CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
+        List<CRoleVo.RoleInfo> r1 = new ArrayList<>();
+        List<CRoleVo.RoleInfo> r2 = new ArrayList<>();
+        //处理角色，只查看自己所属的角色
+        if(ObjectUtil.isNotNull(queryRole)){
+            if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){
+                queryRole.getVisibleList().forEach(roleInfo -> {
+                    if(roleInfo.getMine() == 1){
+                        r1.add(roleInfo);
+                    }else {
+                        r2.add(roleInfo);
+                    }
+                });
+            }
+            if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){
+                queryRole.getInvisibleList().forEach(roleInfo -> {
+                    if(roleInfo.getMine() == 1){
+                        r1.add(roleInfo);
+                    }else {
+                        r2.add(roleInfo);
+                    }
+                });
+            }
+        }
+        queryRole.setVisibleList(r1);
+        queryRole.setInvisibleList(r2);
+
         return JsonResponse.newInstance().ok(queryRole);
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c3b11fb..2fb38e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev