From 35e9c9676434842bc93db5597347d15f6b61984a Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Tue, 30 Mar 2021 16:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/tall/service/IProRoleService.java |  4 +++-
 .../com/ccsens/tall/service/ProRoleService.java  | 16 ++++++++++++++--
 tall/src/main/resources/application.yml          |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
index bbd05263..1faaf820 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
@@ -16,7 +16,9 @@ public interface IProRoleService {
 
     List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId,Integer imitation) throws Exception;
 
-    List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId,Long userId);
+    List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId);
+
+    List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId);
 
     int selectPowerByRoleName(Long userId,Long projectId);
 
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
index d32a3e73..4903f44b 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
@@ -92,7 +92,7 @@ public class ProRoleService implements IProRoleService {
         List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId, imitation);
 
         //1.查询二级角色(项目经理+项目成员+mvp)
-        memberRoleList = getRealMemberRolesByProjectId(projectId,currentUserId);
+        memberRoleList = getRealMemberRolesShowByProjectId(projectId,currentUserId);
 
         if (CollectionUtil.isNotEmpty(memberRoleList)) {
             if (CollectionUtil.isNotEmpty(roleList)) {
@@ -232,9 +232,21 @@ public class ProRoleService implements IProRoleService {
 //        }
         return memberRoleList;
     }
+    @Override
+    public List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId) {
+        //查询二级角色
+        List<ProjectVo.RoleInfo> memberRoleList;
+        memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId);
 
+        //TODO 查询项目配置，
+        if(CollectionUtil.isEmpty(memberRoleList)){
+            return memberRoleList;
+        }
+
+        return memberRoleList;
+    }
     @Override
-    public List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId,Long userId) {
+    public List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId) {
         //先从userid和项目id获取当前用户的成员id，查看role-show里面是否有这个成员的数据
         ProMemberExample proMemberExample=new ProMemberExample();
         proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId).andRecStatusEqualTo((byte)0);
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common